杭州七院规则发送功能更新

src/main/java/com/diagbot/config/RedisConfigurer.java

@@ -133,7 +133,7 @@ public class RedisConfigurer extends CachingConfigurerSupport {
                 sb.append(":" + String.valueOf(obj));
             }
             String rsToUse = String.valueOf(sb);
-            log.info("自动生成Redis Key -> [{}]", rsToUse);
+//            log.info("自动生成Redis Key -> [{}]", rsToUse);
             return rsToUse;
         };
     }

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -65,6 +65,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/behospitalInfo/analyze_run").permitAll()
                 .antMatchers("/qc/behospitalInfo/sendRuleWarn").permitAll()
                 .antMatchers("/qc/behospitalInfo/checkRule").permitAll()
+                .antMatchers("/qc/behospitalInfo/upState").permitAll()
                 .antMatchers("/qc/module/getById").permitAll()
                 .antMatchers("/qc/module/getModuleMap").permitAll()
                 .antMatchers("/qc/cases/getQcCases").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -140,6 +140,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/analyze_run", request)
                 || matchers("/qc/behospitalInfo/sendRuleWarn", request)
                 || matchers("/qc/behospitalInfo/checkRule", request)
+                || matchers("/qc/behospitalInfo/upState", request)
                 || matchers("/qc/module/getById", request)
                 || matchers("/qc/module/getModuleMap", request)
                 || matchers("/qc/cases/getQcCases", request)

src/main/java/com/diagbot/facade/AlgorithmFacade.java

@@ -348,26 +348,26 @@ public class AlgorithmFacade {
         return res;
     }
 
-    public static void main(String[] args) {
-        AlgorithmFacade algorithmFacade = new AlgorithmFacade();
-        System.out.println("100:" + algorithmFacade.getLevel(new BigDecimal(100)));
-        System.out.println("95:" + algorithmFacade.getLevel(new BigDecimal(95)));
-        System.out.println("90.1:" + algorithmFacade.getLevel(new BigDecimal(90.1)));
-        System.out.println("90:" + algorithmFacade.getLevel(new BigDecimal(90)));
-        System.out.println("85:" + algorithmFacade.getLevel(new BigDecimal(85)));
-        System.out.println("80.1:" + algorithmFacade.getLevel(new BigDecimal(80.1)));
-        System.out.println("80:" + algorithmFacade.getLevel(new BigDecimal(80)));
-        System.out.println("79.9:" + algorithmFacade.getLevel(new BigDecimal(79.9)));
-        System.out.println("60:" + algorithmFacade.getLevel(new BigDecimal(60)));
-        System.out.println("0:" + algorithmFacade.getLevel(new BigDecimal(0)));
-
-
-        System.out.println("18:" + algorithmFacade.getHomePageLevel(new BigDecimal(20)));
-        System.out.println("18:" + algorithmFacade.getHomePageLevel(new BigDecimal(18)));
-        System.out.println("17.9:" + algorithmFacade.getHomePageLevel(new BigDecimal(17.9)));
-
-        if (BigDecimalUtil.lt(new BigDecimal(-1), BigDecimal.ZERO)) {
-            System.out.println(BigDecimal.ZERO);
-        }
-    }
+//    public static void main(String[] args) {
+//        AlgorithmFacade algorithmFacade = new AlgorithmFacade();
+//        System.out.println("100:" + algorithmFacade.getLevel(new BigDecimal(100)));
+//        System.out.println("95:" + algorithmFacade.getLevel(new BigDecimal(95)));
+//        System.out.println("90.1:" + algorithmFacade.getLevel(new BigDecimal(90.1)));
+//        System.out.println("90:" + algorithmFacade.getLevel(new BigDecimal(90)));
+//        System.out.println("85:" + algorithmFacade.getLevel(new BigDecimal(85)));
+//        System.out.println("80.1:" + algorithmFacade.getLevel(new BigDecimal(80.1)));
+//        System.out.println("80:" + algorithmFacade.getLevel(new BigDecimal(80)));
+//        System.out.println("79.9:" + algorithmFacade.getLevel(new BigDecimal(79.9)));
+//        System.out.println("60:" + algorithmFacade.getLevel(new BigDecimal(60)));
+//        System.out.println("0:" + algorithmFacade.getLevel(new BigDecimal(0)));
+//
+//
+//        System.out.println("18:" + algorithmFacade.getHomePageLevel(new BigDecimal(20)));
+//        System.out.println("18:" + algorithmFacade.getHomePageLevel(new BigDecimal(18)));
+//        System.out.println("17.9:" + algorithmFacade.getHomePageLevel(new BigDecimal(17.9)));
+//
+//        if (BigDecimalUtil.lt(new BigDecimal(-1), BigDecimal.ZERO)) {
+//            System.out.println(BigDecimal.ZERO);
+//        }
+//    }
 }

src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -137,7 +137,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
 //                    .set("modifier", userId.toString())
 //                    .set("gmt_modified", now));
             String sql = "INSERT INTO JKCDSS.JKCDSS_RULE_WARN (ID, USER_ID, BEHOSPITAL_CODE, STATE, URL, GMT_CREATE, GMT_MODIFIED, CREATOR, MODIFIER, REMARK) " +
-                    "VALUES (" + new Date().getTime() + ", " + userId + ", '" + qcRuleWarnVO.getBehospitalCode() + "', 0, '" + url + "', SYSDATE, SYSDATE, 'LT', 'LT', NULL)";
+                    "VALUES (" + new Date().getTime() + ", " + userId + ", '" + qcRuleWarnVO.getBehospitalCode() + "', 0, '" + url + "', SYSDATE, SYSDATE, 'LT', 'LT', '" + qcRuleWarnVO.getMsg() + "')";
             System.out.println("插入sql语句为--------------------------:" + sql);
             tzDBConn.setRule(sql);
         }
@@ -197,10 +197,36 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
         qcRuleWarnDTO.setNumScore(dBigDecimal);// 缺陷总扣分
         qcRuleWarnDTO.setMsgDTOList(msgDTOList);
 
+        try {
+            String sql = "UPDATE JKCDSS_RULE_WARN SET STATE = 1 WHERE BEHOSPITAL_CODE='" + behospitalCodeVO.getBehospitalCode() + "'";
+            tzDBConn.upRule(sql);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "oracle数据插入失败！");
+        }
+
         return qcRuleWarnDTO;
 
     }
 
+    /**
+     * 医生工作站查看规则条目
+     *
+     * @param behospitalCodeVO
+     * @return QcRuleWarnDTO
+     */
+    public Boolean upState(RecordContentVO behospitalCodeVO) {
+
+        try {
+            String sql = "UPDATE JKCDSS_RULE_WARN SET STATE = 2 WHERE BEHOSPITAL_CODE='" + behospitalCodeVO.getBehospitalCode() + "'";
+            tzDBConn.upRule(sql);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "oracle数据插入失败！");
+        }
+
+        return true;
+
+    }
+
 
     /**
      * 修改评分结果信息

src/main/java/com/diagbot/util/BigDecimalUtil.java

@@ -81,40 +81,40 @@ public class BigDecimalUtil {
 
     }
 
-    public static void main(String[] args) {
-        DecimalFormat df = new DecimalFormat("#.00");
-        DecimalFormat df2 = new DecimalFormat("#0.00");
-        BigDecimal a = new BigDecimal(0.55);
-        BigDecimal b = new BigDecimal(11.55);
-        System.out.println(df.format(a));
-        System.out.println(df2.format(a));
-        System.out.println(df.format(b));
-        System.out.println(df2.format(b));
-
-        System.out.println("====a小于b====");
-        System.out.println(lt(new BigDecimal(1.1), new BigDecimal(1)) == false);
-        System.out.println(lt(new BigDecimal(1), new BigDecimal(1)) == false);
-        System.out.println(lt(new BigDecimal(0.9), new BigDecimal(1)) == true);
-
-        System.out.println("====a等于b====");
-        System.out.println(eq(new BigDecimal(1.1), new BigDecimal(1)) == false);
-        System.out.println(eq(new BigDecimal(1), new BigDecimal(1)) == true);
-        System.out.println(eq(new BigDecimal(0.9), new BigDecimal(1)) == false);
-
-        System.out.println("====a大于b====");
-        System.out.println(gt(new BigDecimal(1.1), new BigDecimal(1)) == true);
-        System.out.println(gt(new BigDecimal(1), new BigDecimal(1)) == false);
-        System.out.println(gt(new BigDecimal(0.9), new BigDecimal(1)) == false);
-
-        System.out.println("====a大于等于b====");
-        System.out.println(ge(new BigDecimal(1.1), new BigDecimal(1)) == true);
-        System.out.println(ge(new BigDecimal(1), new BigDecimal(1)) == true);
-        System.out.println(ge(new BigDecimal(0.9), new BigDecimal(1)) == false);
-
-        System.out.println("====a小于等于b====");
-        System.out.println(le(new BigDecimal(1.1), new BigDecimal(1)) == false);
-        System.out.println(le(new BigDecimal(1), new BigDecimal(1)) == true);
-        System.out.println(le(new BigDecimal(0.9), new BigDecimal(1)) == true);
-
-    }
+//    public static void main(String[] args) {
+//        DecimalFormat df = new DecimalFormat("#.00");
+//        DecimalFormat df2 = new DecimalFormat("#0.00");
+//        BigDecimal a = new BigDecimal(0.55);
+//        BigDecimal b = new BigDecimal(11.55);
+//        System.out.println(df.format(a));
+//        System.out.println(df2.format(a));
+//        System.out.println(df.format(b));
+//        System.out.println(df2.format(b));
+//
+//        System.out.println("====a小于b====");
+//        System.out.println(lt(new BigDecimal(1.1), new BigDecimal(1)) == false);
+//        System.out.println(lt(new BigDecimal(1), new BigDecimal(1)) == false);
+//        System.out.println(lt(new BigDecimal(0.9), new BigDecimal(1)) == true);
+//
+//        System.out.println("====a等于b====");
+//        System.out.println(eq(new BigDecimal(1.1), new BigDecimal(1)) == false);
+//        System.out.println(eq(new BigDecimal(1), new BigDecimal(1)) == true);
+//        System.out.println(eq(new BigDecimal(0.9), new BigDecimal(1)) == false);
+//
+//        System.out.println("====a大于b====");
+//        System.out.println(gt(new BigDecimal(1.1), new BigDecimal(1)) == true);
+//        System.out.println(gt(new BigDecimal(1), new BigDecimal(1)) == false);
+//        System.out.println(gt(new BigDecimal(0.9), new BigDecimal(1)) == false);
+//
+//        System.out.println("====a大于等于b====");
+//        System.out.println(ge(new BigDecimal(1.1), new BigDecimal(1)) == true);
+//        System.out.println(ge(new BigDecimal(1), new BigDecimal(1)) == true);
+//        System.out.println(ge(new BigDecimal(0.9), new BigDecimal(1)) == false);
+//
+//        System.out.println("====a小于等于b====");
+//        System.out.println(le(new BigDecimal(1.1), new BigDecimal(1)) == false);
+//        System.out.println(le(new BigDecimal(1), new BigDecimal(1)) == true);
+//        System.out.println(le(new BigDecimal(0.9), new BigDecimal(1)) == true);
+//
+//    }
 }

src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -143,6 +143,15 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(qcresultInfoFacade.checkRule(behospitalCodeVO));
     }
 
+    @ApiOperation(value = "修改发送信息中间表的状态为已解决[by:dsYun]",
+            notes = "")
+    @PostMapping("/upState")
+    @SysLogger("upState")
+    @Transactional
+    public RespDTO<Boolean> upState(@RequestBody RecordContentVO behospitalCodeVO) {
+        return RespDTO.onSuc(qcresultInfoFacade.upState(behospitalCodeVO));
+    }
+
     @ApiOperation(value = "新增质控条目[by:zhoutg]",
             notes = "")
     @PostMapping("/addCase")