Revert "中药上线西药不打印处理"

This reverts commit 2ea9054d654ccd90b1ec47d7c5bd73f950bc4a32.

src/main/java/cn/hnthyy/thmz/service/impl/thmz/DispensingSocketServiceImpl.java

@@ -78,6 +78,7 @@ public class DispensingSocketServiceImpl implements DispensingSocketService {
         List<MzChargeDetail> chargeDetails = mzChargeDetailService.getMzChargeDetailList(mzChargeDetail);
         List<MzChargeDetail> xyChargeDetail = new ArrayList<>();
         List<MzChargeDetail> ycChargeDetail = new ArrayList<>();
+        List<MzChargeDetail> zyChargeDetail = new ArrayList<>();
         for (int i = 0; i < chargeDetails.size(); i++) {
             MzChargeDetail chargeDetail = chargeDetails.get(i);
             if(chargeDetail.getPrintFlag().equals("0")){
@@ -85,10 +86,12 @@ public class DispensingSocketServiceImpl implements DispensingSocketService {
                     xyChargeDetail.add(chargeDetail);
                 }else if(chargeDetail.getGroupNo().equals("91")){
                     ycChargeDetail.add(chargeDetail);
+                }else if(chargeDetail.getGroupNo().equals("81")){
+                    zyChargeDetail.add(chargeDetail);
                 }
             }
         }
-        if(xyChargeDetail.size() > 0 || ycChargeDetail.size() > 0){
+        if(xyChargeDetail.size() > 0 || ycChargeDetail.size() > 0 || zyChargeDetail.size() > 0){
             Map<String,Object> msgMap = new HashMap();
             msgMap.put("patient_id",patientId);
             MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(patientId);
@@ -114,6 +117,14 @@ public class DispensingSocketServiceImpl implements DispensingSocketService {
                 objTypes.add(SocketSenderTypeEnum.DISPENSING_MEDICINE.code);
                 sendMessage(msgMap,objTypes);
             }
+            if(zyChargeDetail.size() > 0){
+                Set<Integer> orderNos = zyChargeDetail.stream().map(MzChargeDetail::getOrderNo).collect(Collectors.toSet());
+                msgMap.put("orderNos",orderNos);
+                msgMap.put("groupNo",zyChargeDetail.get(0).getGroupNo());
+                List<String> objTypes = new ArrayList<>();
+                objTypes.add(SocketSenderTypeEnum.DISPENSING_MEDICINE.code);
+                sendMessage(msgMap,objTypes);
+            }
         }
         return 0;
     }