From a445ad299c6038304b207c529319b4c0eed06027 Mon Sep 17 00:00:00 2001
From: "Wang.Huan" <wanghuan@ccbjb.com.cn>
Date: Wed, 19 Mar 2025 18:15:51 +0800
Subject: [PATCH] tb

---
 .../impl/DoctorStationAdviceAppServiceImpl.java        |  8 +++++---
 .../openhis/web/doctorstation/dto/AdviceSaveDto.java   | 10 ++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index fe8501b8..144f239c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -183,6 +183,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // 生成处方号 , 只有开了药品才有处方号
         String prescriptionNo = "";
         if (medicineList.size() > 0) {
+            // TODO: 药品分方;待做
             prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_NO.getPrefix(), 8);
         }
         // 保存药品请求
@@ -209,6 +210,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             medicationRequest.setRateCode(adviceSaveDto.getRateCode());
             medicationRequest.setDose(adviceSaveDto.getDose());
             medicationRequest.setDoseUnitCode(adviceSaveDto.getDoseUnitCode());
+            medicationRequest.setGroupId(adviceSaveDto.getGroupId());// 分组id
             // medicationRequest.setPackageId(adviceSaveDto.getPackageId());
 
             medicationRequestList.add(medicationRequest);
@@ -221,7 +223,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         for (AdviceSaveDto adviceSaveDto : deviceList) {
             deviceRequest = new DeviceRequest();
             deviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 8));
-            deviceRequest.setPrescriptionNo(prescriptionNo);
+            // deviceRequest.setPrescriptionNo(prescriptionNo); // 耗材不需要处方号
             deviceRequest.setQuantity(adviceSaveDto.getQuantity());
             deviceRequest.setUnitCode(adviceSaveDto.getUnitCode());
             deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());
@@ -246,7 +248,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         for (AdviceSaveDto adviceSaveDto : activityList) {
             serviceRequest = new ServiceRequest();
             serviceRequest.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 8));
-            serviceRequest.setPrescriptionNo(prescriptionNo);
+            // serviceRequest.setPrescriptionNo(prescriptionNo); // 诊疗不需要处方号
             serviceRequest.setBasedOnTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
             serviceRequest.setBasedOnId(adviceSaveDto.getAdviceDefinitionId());
             serviceRequest.setQuantity(adviceSaveDto.getQuantity());
@@ -286,7 +288,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             chargeItemList.add(chargeItem);
         }
         iChargeItemService.saveBatch(chargeItemList);
-        // TODO: 此处调用请求方法接口
+        // TODO: 此处调用请求发放接口
 
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"门诊医嘱"}));
     }
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
index 8258b038..259959c7 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
@@ -94,13 +94,19 @@ public class AdviceSaveDto {
     /** 剂量单位 */
     private String doseUnitCode;
 
+    /**
+     * 分组id , 一组药品共用一个id,前端传过来
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
     /** 组套id */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long packageId; // 该参数先预留出来
+    private Long packageId;
 
     /** 活动(项目)定义id */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long activityId; // 该参数先预留出来
+    private Long activityId;
 
     /**
      * 设置默认值