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

tb

Browse Source
This commit is contained in:
Wang.Huan
2025-03-19 18:15:51 +08:00
parent c23da71b93
commit a445ad299c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
View File

@@ -183,6 +183,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 生成处方号 , 只有开了药品才有处方号 // 生成处方号 , 只有开了药品才有处方号
String prescriptionNo = ""; String prescriptionNo = "";
if (medicineList.size() > 0) { if (medicineList.size() > 0) {
// TODO: 药品分方;待做
prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_NO.getPrefix(), 8); prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_NO.getPrefix(), 8);
} }
// 保存药品请求 // 保存药品请求
@@ -209,6 +210,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
medicationRequest.setRateCode(adviceSaveDto.getRateCode()); medicationRequest.setRateCode(adviceSaveDto.getRateCode());
medicationRequest.setDose(adviceSaveDto.getDose()); medicationRequest.setDose(adviceSaveDto.getDose());
medicationRequest.setDoseUnitCode(adviceSaveDto.getDoseUnitCode()); medicationRequest.setDoseUnitCode(adviceSaveDto.getDoseUnitCode());
medicationRequest.setGroupId(adviceSaveDto.getGroupId());// 分组id
// medicationRequest.setPackageId(adviceSaveDto.getPackageId()); // medicationRequest.setPackageId(adviceSaveDto.getPackageId());
medicationRequestList.add(medicationRequest); medicationRequestList.add(medicationRequest);
@@ -221,7 +223,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
for (AdviceSaveDto adviceSaveDto : deviceList) { for (AdviceSaveDto adviceSaveDto : deviceList) {
deviceRequest = new DeviceRequest(); deviceRequest = new DeviceRequest();
deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 8)); deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 8));
deviceRequest.setPrescriptionNo(prescriptionNo); // deviceRequest.setPrescriptionNo(prescriptionNo); // 耗材不需要处方号
deviceRequest.setQuantity(adviceSaveDto.getQuantity()); deviceRequest.setQuantity(adviceSaveDto.getQuantity());
deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); deviceRequest.setUnitCode(adviceSaveDto.getUnitCode());
deviceRequest.setLotNumber(adviceSaveDto.getLotNumber()); deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());
@@ -246,7 +248,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
for (AdviceSaveDto adviceSaveDto : activityList) { for (AdviceSaveDto adviceSaveDto : activityList) {
serviceRequest = new ServiceRequest(); serviceRequest = new ServiceRequest();
serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 8)); serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 8));
serviceRequest.setPrescriptionNo(prescriptionNo); // serviceRequest.setPrescriptionNo(prescriptionNo); // 诊疗不需要处方号
serviceRequest.setBasedOnTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION); serviceRequest.setBasedOnTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
serviceRequest.setBasedOnId(adviceSaveDto.getAdviceDefinitionId()); serviceRequest.setBasedOnId(adviceSaveDto.getAdviceDefinitionId());
serviceRequest.setQuantity(adviceSaveDto.getQuantity()); serviceRequest.setQuantity(adviceSaveDto.getQuantity());
@@ -286,7 +288,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItemList.add(chargeItem); chargeItemList.add(chargeItem);
} }
iChargeItemService.saveBatch(chargeItemList); iChargeItemService.saveBatch(chargeItemList);
// TODO: 此处调用请求方法接口 // TODO: 此处调用请求发放接口
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"门诊医嘱"})); return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"门诊医嘱"}));
} }

10
openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
View File

@@ -94,13 +94,19 @@ public class AdviceSaveDto {
/** 剂量单位 */ /** 剂量单位 */
private String doseUnitCode; private String doseUnitCode;
/**
* 分组id , 一组药品共用一个id,前端传过来
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long groupId;
/** 组套id */ /** 组套id */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long packageId; // 该参数先预留出来 private Long packageId;
/** 活动(项目)定义id */ /** 活动(项目)定义id */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long activityId; // 该参数先预留出来 private Long activityId;
/** /**
* 设置默认值 * 设置默认值