Merge branch 'dev/20200603_1.3.1' into debug

doc/006.20200604v1.3.1/qc_initv1.3.1.sql

@@ -2,11 +2,11 @@ use `qc`;
 
 UPDATE `sys_task_cron` SET `id`='-1', `is_deleted`='N', `gmt_create`='1970-01-01 12:00:00', `gmt_modified`='1970-01-01 12:00:00', `creator`='0', `modifier`='0', `cron_code`='TASK_CX', `cron`='0 0 4 * * ?', `param`='1', `is_used`='1', `remark`='每天早上自动评分当天外的未评分的数据、同时强制质控出院日期推前三天的数据' WHERE (`id`='-1');
 
-alter table qc_cases_entry add COLUMN `rule_type` TINYINT(4) DEFAULT '0' COMMENT '规则类型(0：无，1：空项，2：错误)' after `name`;
-INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('286', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '日常病程录', '56', '1', '286', '所属模块');
-INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('287', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '无', '0', '1', '1', '质控错误类型');
-INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('288', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '空项', '1', '1', '2', '质控错误类型');
-INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('289', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '错误', '2', '1', '3', '质控错误类型');
+-- alter table qc_cases_entry add COLUMN `rule_type` TINYINT(4) DEFAULT '0' COMMENT '规则类型(0：无，1：空项，2：错误)' after `name`;
+-- INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('286', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '12', '日常病程录', '56', '1', '286', '所属模块');
+-- INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('287', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '无', '0', '1', '1', '质控错误类型');
+-- INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('288', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '空项', '1', '1', '2', '质控错误类型');
+-- INSERT INTO `sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('289', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '14', '错误', '2', '1', '3', '质控错误类型');
 
 
 ALTER TABLE `med_qcresult_detail` ADD INDEX `idx_cases_entry_id` (`cases_entry_id`) USING BTREE;

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

@@ -56,14 +56,8 @@ public class AlgorithmFacade {
         dataDeal(algorithmVO);
 
         BigDecimal res = BigDecimal.ZERO;
-        //计算得分
-        if (algorithmVO.getHospitalId().equals(1L)) {
-            //长兴医院的情况下
-            res = getScoreForCx(algorithmVO);
-        } else {
-            //非长兴医院的情况下
-            res = cal(algorithmVO);
-        }
+        //统一为长兴的算法
+        res = getScoreForCx(algorithmVO);
         return res;
     }
 
@@ -241,8 +235,8 @@ public class AlgorithmFacade {
      */
     private BigDecimal cal(AlgorithmVO algorithmVO) {
         BigDecimal res = new BigDecimal(100);
-        if (algorithmVO.getHospitalId().equals(1L)
-                && algorithmVO.getIsHomePage().equals(true)) {
+        //统一为长兴的算法
+        if (algorithmVO.getIsHomePage().equals(true)) {
             res = new BigDecimal(20);
         }
         //模块总分

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

@@ -254,32 +254,30 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 break;
         }
 
-        //长兴的数据
-        if (algorithmVO.getHospitalId().equals(1L)) {
-            //质控模块评分数据
-            //逻辑删除数据
-            medQcresultCasesService.update(new UpdateWrapper<MedQcresultCases>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", analyzeVO.getHospitalId())
-                    .eq("behospital_code", analyzeVO.getBehospitalCode())
-                    .set("is_deleted", IsDeleteEnum.Y.getKey())
-                    .set("modifier", useId)
-                    .set("gmt_modified", now));
-            //批量插入新的数据
-            List<MedQcresultCases> medQcresultCasesList = new ArrayList<>();
-            List<MedQcresultCasesVO> medQcresultCasesVOList = algorithmVO.getMedQcresultCasesVOList();
-            if (ListUtil.isNotEmpty(medQcresultCasesVOList)) {
-                for (MedQcresultCasesVO medQcresultCasesVO : medQcresultCasesVOList) {
-                    MedQcresultCases medQcresultCases = new MedQcresultCases();
-                    BeanUtil.copyProperties(medQcresultCasesVO, medQcresultCases);
-                    medQcresultCases.setGmtCreate(now);
-                    medQcresultCases.setCreator(useId.toString());
-                    medQcresultCases.setGmtModified(now);
-                    medQcresultCases.setModifier(useId.toString());
-                    medQcresultCasesList.add(medQcresultCases);
-                }
-                medQcresultCasesService.saveBatch(medQcresultCasesList);
+        //质控模块评分数据
+        //统一为长兴的算法
+        //逻辑删除数据
+        medQcresultCasesService.update(new UpdateWrapper<MedQcresultCases>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", analyzeVO.getHospitalId())
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                .set("modifier", useId)
+                .set("gmt_modified", now));
+        //批量插入新的数据
+        List<MedQcresultCases> medQcresultCasesList = new ArrayList<>();
+        List<MedQcresultCasesVO> medQcresultCasesVOList = algorithmVO.getMedQcresultCasesVOList();
+        if (ListUtil.isNotEmpty(medQcresultCasesVOList)) {
+            for (MedQcresultCasesVO medQcresultCasesVO : medQcresultCasesVOList) {
+                MedQcresultCases medQcresultCases = new MedQcresultCases();
+                BeanUtil.copyProperties(medQcresultCasesVO, medQcresultCases);
+                medQcresultCases.setGmtCreate(now);
+                medQcresultCases.setCreator(useId.toString());
+                medQcresultCases.setGmtModified(now);
+                medQcresultCases.setModifier(useId.toString());
+                medQcresultCasesList.add(medQcresultCases);
             }
+            medQcresultCasesService.saveBatch(medQcresultCasesList);
         }
         return now;
     }