wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

Browse Source
This commit is contained in:
liuhongrui
2025-03-30 14:58:29 +08:00
parent 9346a0ace1 a8f9643da7
commit 32a31a9c3b
7 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/IWesternMedicineDispenseAppServiceImpl.java
View File

@@ -125,7 +125,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
PrescriptionPatientInfoDto prescriptionPatientInfoDto = westernMedicineDispenseMapper.
selectPrescriptionPatientInfo(encounterId);
// 年龄
prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirth_date()));
prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirthDate()));
// 性别
prescriptionPatientInfoDto.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class,
prescriptionPatientInfoDto.getGenderEnum()));
@@ -141,7 +141,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
if(!prescriptionMedicineInfoList.isEmpty()) {
BigDecimal totalPrice = new BigDecimal(0);
for (PrescriptionMedicineInfoDto item : prescriptionMedicineInfoList) {
totalPrice.add(item.getTotal_price());
totalPrice.add(item.getTotalPrice());
}
prescriptionPatientInfoDto.setTotalPrice(totalPrice);
}

3
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoPageDto.java
View File

@@ -5,6 +5,8 @@ package com.openhis.web.pharmacymanage.dto;
import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -21,6 +23,7 @@ public class EncounterInfoPageDto implements Serializable {
private static final long serialVersionUID = 1L;
/** 就诊ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 科室 */

2
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
View File

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
public class EncounterInfoSearchParam implements Serializable {
/** 科室 */
private long departmentId;
private Long departmentId;
/** 患者姓名或者证件号 */
private String condition;

2
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionMedicineInfoDto.java
View File

@@ -76,5 +76,5 @@ public class PrescriptionMedicineInfoDto implements Serializable {
private BigDecimal unitPrice;
/** 金额 */
private BigDecimal total_price;
private BigDecimal totalPrice;
}

2
openhis-server/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PrescriptionPatientInfoDto.java
View File

@@ -30,7 +30,7 @@ public class PrescriptionPatientInfoDto implements Serializable {
private String genderEnum_enumText;
/** 生日 */
private Date birth_date;
private Date birthDate;
/** 年龄 */
private String age;

5
openhis-server/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -8,16 +8,17 @@
patient_name,
gender_enum,
encounter_date,
organization_id,
department_id,
id_card,
start_time
FROM
(
SELECT
T1.tenant_id,
T1.id AS encounter_id,
T1.start_time,
TO_CHAR(T1.start_time,'YYYY-MM-DD') AS encounter_date,
T1.organization_id,
T1.organization_id AS department_id,
T2.gender_enum,
T2.name AS patient_name,
T2.id_card,