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

去掉保存日志

See merge request lihong/thmz_system!1

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

@@ -582,18 +582,6 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             }
         }
 
-        // 发药记录存根日志，以备查验记录
-        if(yyzos != null && yyzos.size() > 0){
-            // 目前开放长期，临时医嘱单存放日志
-            if("5".equals(yyzos.get(0).getPageClass()) || "6".equals(yyzos.get(0).getPageClass())){
-                List<YzYpZyOrder> yzYpList = new ArrayList<>(yyzos);
-                try {
-                    callSaveSendOrPrintYpYzDetail(yzYpList, "1");
-                } catch (Exception e) {
-                    log.error("发药记录存根日志出错--1");
-                }
-            }
-        }
         resultMap.put("code", 0);
         resultMap.put("message", "保存领药单发药数据成功");
         return resultMap;
@@ -980,24 +968,6 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             }
         }
 
-        // 保存口服药打印查询记录信息
-        if(yfWardVos.size() > 0){
-            // 目前开放长期，临时医嘱单存放日志
-            if("5".equals(yfWardVos.get(0).getPageClass()) || "6".equals(yfWardVos.get(0).getPageClass())){
-                List<YzYpZyOrder> yzYpList = new ArrayList<>();
-                for (YfWardVo vo: yfWardVos) {
-                    YzYpZyOrder yz = new YzYpZyOrder();
-                    BeanUtils.copyProperties(vo, yz);
-                    yzYpList.add(yz);
-                }
-                try {
-                    callSaveSendOrPrintYpYzDetail(yzYpList, "2");
-                } catch (Exception e) {
-                    log.error("发药打印存根日志出错--2");
-                }
-            }
-        }
-
         return yfWardVos;
     }