Merge branch 'dev-1.1.4' into 'dev-1.1.4'

住院统领单打印优化

See merge request lihong/thmz_system!48

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -1166,6 +1166,15 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
         boolean flag = false;
         int pid = 1;
         for(YpSummaryPrint ypPrint : summaryData){
+            ypPrint.setId(String.valueOf(System.currentTimeMillis()));
+            ypPrint.setSort(pid);
+            pid ++;
+            ypPrint.setCreateDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            ypPrint.setPageNo(pageNo);
+            ypPrint.setPageClass(vo.getPageClass());
+            ypPrint.setSubmitFlag(String.valueOf(vo.getSubmitFlag()));
+            ypPrint.setPrintFlag(vo.getPrintFlag());
+
             String chargeCode = ypPrint.getChargeCode();
             String serial = ypPrint.getSerial();
             BigDecimal printAmount = ypPrint.getAmount();
@@ -1187,27 +1196,18 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                 }
                 ypPrint.setResult("有误差,实际发药数量: " + realAmount + ", 打印数量: " + printAmount);
             } else {
-                ypPrint.setResult("正常");
+                ypPrint.setResult("正常,实际发药数量: " + realAmount + ", 打印数量: " + printAmount);
             }
-            ypPrint.setId(String.valueOf(System.currentTimeMillis()));
-            ypPrint.setSort(pid);
-            ypPrint.setPageNo(pageNo);
-            ypPrint.setPageClass(vo.getPageClass());
-            ypPrint.setSubmitFlag(String.valueOf(vo.getSubmitFlag()));
-            ypPrint.setPrintFlag(vo.getPrintFlag());
             // 医嘱实际发药量
             ypPrint.setRealAmount(realAmount);
-            ypPrint.setCreateDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
-            pid ++;
         }
         if(StringUtils.isNotBlank(msg)) {
+            log.info(msg);
             vo.setMessage(msg);
         }
-        if(flag){
-            List<List<YpSummaryPrint>> result = ListSizeControlUtil.splitList(summaryData, 70);
-            for (List<YpSummaryPrint> record: result) {
-                ypZyPatientMapper.insertSummaryData(record);
-            }
+        List<List<YpSummaryPrint>> result = ListSizeControlUtil.splitList(summaryData, 70);
+        for (List<YpSummaryPrint> record: result) {
+            ypZyPatientMapper.insertSummaryData(record);
         }
         resultMap.put("msg", msg);
         return resultMap;

src/main/resources/static/js/yf/ward_prescription.js

@@ -1999,8 +1999,6 @@ function saveSummaryData(printFlag, summaryData) {
             if (res.code === 0) {
                 // 提示药单不一致的情况
                 // successMesage(res);
-            } else {
-                errorMesage(res);
             }
         }
     });