控制判断

src/main/java/thyyxxk/webserver/service/medicaladvice/patientinfo/ZkManageService.java

@@ -111,11 +111,7 @@ public class ZkManageService {
 
     private boolean passZk(ZkBedVo param) {
         String SJ_DEPT_CODE = yzConfig.getShoushubingqu();
-
-        if (SJ_DEPT_CODE.equals(param.getDeptCode()) || SJ_DEPT_CODE.equals(param.getWardCode())) {
-            return true;
-        }
-        return false;
+        return SJ_DEPT_CODE != null && (SJ_DEPT_CODE.equals(param.getDeptCode()) || SJ_DEPT_CODE.equals(param.getWardCode()));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -159,7 +155,7 @@ public class ZkManageService {
             dao.insertZyAdt(item);
             item.setOpId(userId);
             String SJ_DEPT_CODE = yzConfig.getShoushubingqu();
-            if (SJ_DEPT_CODE.equals(item.getOrigDept()) || SJ_DEPT_CODE.equals(item.getWardCode())) {
+            if (SJ_DEPT_CODE != null && (SJ_DEPT_CODE.equals(item.getOrigDept()) || SJ_DEPT_CODE.equals(item.getWardCode()))) {
                 dao.insertZyZkListNoActOrderNo(item);
             } else {
                 dao.insertZyZkList(item);

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -1541,16 +1541,13 @@ public class YiZhuLuRuServer {
      * @param times 次数
      */
     public void updateChargeByWardCode(String patNo, Integer times) {
-
         if (StrUtil.isBlank(yzConfig.getShoushubingqu())) {
             return;
         }
-
         String opRecordWard = dao.getOpRecordWard(patNo, times);
         if (opRecordWard == null) {
             return;
         }
-
         dao.updateChargeWard(patNo, times, opRecordWard, yzConfig.getShoushubingqu());
 
     }