长期口服打印按医嘱分组

src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -289,17 +289,14 @@ public class YfWardPrescriptionController {
             List<YfWardVo> byjList = new ArrayList<>();
             List<YfWardVo> list = new ArrayList<>();
             //病人单个药品统计
-            Map<String, Double> countMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getInpatientNo()
-                    + "_" + yfWardVo.getChargeCode() + "_" + yfWardVo.getSerial(), Collectors.summingDouble(YfWardVo::getAmount)));
-            Map<String, Set<Date>> occTimeMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getInpatientNo()
-                    + "_" + yfWardVo.getChargeCode() + "_" + yfWardVo.getSerial(), Collectors.mapping(YfWardVo::getOccTime, Collectors.toSet())));
+            Map<String, Double> countMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getActOrderNo().toString(), Collectors.summingDouble(YfWardVo::getAmount)));
+            Map<String, Set<Date>> occTimeMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getActOrderNo().toString(), Collectors.mapping(YfWardVo::getOccTime, Collectors.toSet())));
             //根据病人药品分组
-            Map<String, List<YfWardVo>> groupMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getInpatientNo()
-                    + "_" + yfWardVo.getChargeCode() + "_" + yfWardVo.getSerial()));
+            Map<String, List<YfWardVo>> groupMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getActOrderNo().toString()));
             for (List<YfWardVo> y : groupMap.values()) {
                 YfWardVo yfWardVo = y.get(0);
-                yfWardVo.setAmount(countMap.get(yfWardVo.getInpatientNo() + "_" + yfWardVo.getChargeCode() + "_" + yfWardVo.getSerial()));
-                Set<Date> dates = occTimeMap.get(yfWardVo.getInpatientNo() + "_" + yfWardVo.getChargeCode() + "_" + yfWardVo.getSerial());
+                yfWardVo.setAmount(countMap.get(yfWardVo.getActOrderNo().toString()));
+                Set<Date> dates = occTimeMap.get(yfWardVo.getActOrderNo().toString());
                 String kssj = "";
                 String jssj = "";
                 for (Date date : dates) {

src/main/java/cn/hnthyy/thmz/entity/his/yz/YzActOrderCy.java

@@ -88,7 +88,7 @@ public class YzActOrderCy {
 	 */
   private String pageNo;
 	/**
-	 * null
+	 * 1录入 2收费 3提交 4发药
 	 */
   private String statusFlag;
 	/**