Forráskód Böngészése

住院统领单打印优化

hsh 1 éve
szülő
commit
4342468494

+ 5 - 6
src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -1187,7 +1187,7 @@ 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);
@@ -1201,13 +1201,12 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             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;

+ 0 - 2
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);
             }
         }
     });