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

发药修改

Browse Source
This commit is contained in:
菲菲
2025-03-30 14:36:18 +08:00
parent 27e33df001
commit b7fb7c3746
6 changed files with 11 additions and 7 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. PrescriptionPatientInfoDto prescriptionPatientInfoDto = westernMedicineDispenseMapper.
selectPrescriptionPatientInfo(encounterId); selectPrescriptionPatientInfo(encounterId);
// 年龄 // 年龄
prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirth_date())); prescriptionPatientInfoDto.setAge(AgeCalculatorUtil.getAge(prescriptionPatientInfoDto.getBirthDate()));
// 性别 // 性别
prescriptionPatientInfoDto.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, prescriptionPatientInfoDto.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class,
prescriptionPatientInfoDto.getGenderEnum())); prescriptionPatientInfoDto.getGenderEnum()));
@@ -141,7 +141,7 @@ public class IWesternMedicineDispenseAppServiceImpl implements IWesternMedicineD
if(!prescriptionMedicineInfoList.isEmpty()) { if(!prescriptionMedicineInfoList.isEmpty()) {
BigDecimal totalPrice = new BigDecimal(0); BigDecimal totalPrice = new BigDecimal(0);
for (PrescriptionMedicineInfoDto item : prescriptionMedicineInfoList) { for (PrescriptionMedicineInfoDto item : prescriptionMedicineInfoList) {
totalPrice.add(item.getTotal_price()); totalPrice.add(item.getTotalPrice());
} }
prescriptionPatientInfoDto.setTotalPrice(totalPrice); 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 java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@@ -21,6 +23,7 @@ public class EncounterInfoPageDto implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 就诊ID */ /** 就诊ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId; 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 { public class EncounterInfoSearchParam implements Serializable {
/** 科室 */ /** 科室 */
private long departmentId; private Long departmentId;
/** 患者姓名或者证件号 */ /** 患者姓名或者证件号 */
private String condition; 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 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 String genderEnum_enumText;
/** 生日 */ /** 生日 */
private Date birth_date; private Date birthDate;
/** 年龄 */ /** 年龄 */
private String age; private String age;

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

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