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

UP 药品状态check

Browse Source
This commit is contained in:
liuhongrui
2025-03-20 13:55:18 +08:00
parent 2e8790aa6b
commit 51cd82211d
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java
View File

@@ -87,7 +87,7 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
// 性别 // 性别
e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
// 计算年龄 // 计算年龄
e.setAgeString(AgeCalculatorUtil.getAge(e.getBirthDate())); e.setAgeString(AgeCalculatorUtil.getAge(DateUtils.parseDate(e.getBirthDate())));
}); });
return outpatientInfusionPatientDto; return outpatientInfusionPatientDto;
@@ -161,6 +161,13 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
// 构造批量插入的 ServiceRequest 列表 // 构造批量插入的 ServiceRequest 列表
List<ServiceRequest> serviceRequests = new ArrayList<>(); List<ServiceRequest> serviceRequests = new ArrayList<>();
for (OutpatientInfusionRecordDto record : groupRecords) { for (OutpatientInfusionRecordDto record : groupRecords) {
//判断当前组药品状态不是已领药，有未领药的数据，跳过执行下一组数据
if(record.getMedicationStatusEnum() != EventStatus.COMPLETED.getValue()){
// 跳过当前分组的剩余处理，继续下一个分组
break;
}
String prefixBusNo = record.getBusNo() + "." + record.getGroupId() + "." + record.getMedicationId(); String prefixBusNo = record.getBusNo() + "." + record.getGroupId() + "." + record.getMedicationId();
// 获取执行次数 // 获取执行次数
Long exeCount = Long exeCount =

2
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionPatientDto.java
View File

@@ -42,7 +42,7 @@ public class OutpatientInfusionPatientDto {
private String genderEnum_enumText; private String genderEnum_enumText;
/** 病人生日 */ /** 病人生日 */
private Date birthDate; private String birthDate;
/** 病人身份证号 */ /** 病人身份证号 */
private String idCard; private String idCard;

2
openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml
View File

@@ -151,7 +151,7 @@
sr.prescription_no, --处方号 sr.prescription_no, --处方号
sr.encounter_id, sr.encounter_id,
e.bus_no as encounter_bus_no, --就诊号 e.bus_no as encounter_bus_no, --就诊号
pt.birth_date , --病人生日 TO_CHAR(pt.birth_date, 'YYYY-MM-DD') AS birth_date , --病人生日
pt.bus_no AS patient_bus_no, --病人ID（前台显示用） pt.bus_no AS patient_bus_no, --病人ID（前台显示用）
sr.patient_id, --病人ID sr.patient_id, --病人ID
pt.name AS patient_name, --病人姓名 pt.name AS patient_name, --病人姓名