sql脚本修改

doc/031.20210326v2.0.3/qc_initv2.0.3.sql

@@ -267,18 +267,22 @@ INSERT INTO `med_outpatient_info` VALUES ('200701106000029', '4', '马立站', '
 
 --  菜单添加
 INSERT INTO `sys_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `parent_id`, `code`, `show_status`, `maintain_status`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医疗质量控制', '-1', 'YH-ZKK-YLZLKZ', '1', '1', '-4', '用户-医疗质量');
-INSERT INTO `sys_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `parent_id`, `code`, `show_status`, `maintain_status`, `order_no`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医疗质量控制指标', '50', 'YH-ZKK-YLZLKZZB_XQ', '1', '1', '0', '用户-科室主任-医疗质量控制指标_详情');
+SET @id =@@identity;
+INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', @id, NULL);
+INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', @id, NULL);
 
-INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '41', NULL);
-INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '41', NULL);
-INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '42', NULL);
-INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '42', NULL);
+INSERT INTO `sys_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `parent_id`, `code`, `show_status`, `maintain_status`, `order_no`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医疗质量控制指标', @id, 'YH-ZKK-YLZLKZZB_XQ', '1', '1', '0', '用户-科室主任-医疗质量控制指标_详情');
+SET @id2 =@@identity;
+INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', @id2, NULL);
+INSERT INTO `sys_role_menu` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `menu_id`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', @id2, NULL);
 
-INSERT INTO `sys_permission` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医疗质量控制指标', 'FUNC000110', '/qc/behospitalInfo/getMedQualityCoList', 'ALL', '医疗质量控制指标表', NULL);
 
-INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '108', NULL);
+INSERT INTO `sys_permission` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `name`, `code`, `permissionUrl`, `method`, `descritpion`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '医疗质量控制指标', 'FUNC000110', '/qc/behospitalInfo/getMedQualityCoList', 'ALL', '医疗质量控制指标表', NULL);
+SET @id3 =@@identity;
+INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', @id3, NULL);
+INSERT INTO `sys_role_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `role_id`, `permission_id`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', @id3, NULL);
 
-INSERT INTO `sys_menu_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`, `order_nu`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '42', '108', '医疗质量控制指标表', NULL);
+INSERT INTO `sys_menu_permission` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`, `order_nu`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', @id2, @id3, '医疗质量控制指标表', NULL);
 
 
 -- 病案指标列表返回

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

@@ -392,7 +392,7 @@ public class ConsoleFacade {
      * @param filterVO
      * @return 2170
      */
-    public List<Map<String, String>> medicalRecordIndicator(FilterVO filterVO) {
+    public List<Map<String, String>> medicalRecordIndicator(FilterVO filterVO){
         filterFacade.filterVOSet(filterVO);
         String indexName = filterVO.getIndexName();
         List<Map<String, String>> hashMapArrayList = new ArrayList<>();
@@ -453,14 +453,7 @@ public class ConsoleFacade {
             if (QualityContent.NEED_MEDICAL_ADVICE.contains(indexName)) {
                 filterVO.setFlagStr("2");
                 List<MedManageParamsDTO> doctorAdviceMedManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
-                Map<String, Long> adviceNum = null;
-                try {
-                    adviceNum = getAdviceNum(filterVO,doctorAdviceMedManageParams);
-                } catch (ExecutionException e) {
-                    e.printStackTrace();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+                Map<String, Long> adviceNum = getAdviceNum(filterVO,doctorAdviceMedManageParams);
                 //手术人数
                 Long operationFeeNum = selectOperationNumMap.get("operationFee");
                 Long operation = adviceNum.get("operation");
@@ -644,7 +637,7 @@ public class ConsoleFacade {
     /**
      * 遍历医嘱信息存入相关数据
      */
-    public Map<String,Long> getAdviceNum(FilterVO filterVO,List<MedManageParamsDTO> doctorAdviceMedManageParamsList) throws ExecutionException, InterruptedException {
+    public Map<String,Long> getAdviceNum(FilterVO filterVO,List<MedManageParamsDTO> doctorAdviceMedManageParamsList) {
         CopyOnWriteArrayList<MedManageParamsDTO> doctorAdviceMedManageParams = new CopyOnWriteArrayList<>(doctorAdviceMedManageParamsList);
         Map map = new HashMap<String,Integer>();
         List<String> CTBehospitalCode = new CopyOnWriteArrayList<>();
@@ -654,94 +647,100 @@ public class ConsoleFacade {
         List<String> pathologyBehospitalCode = new CopyOnWriteArrayList<>();
         List<String> behospitalCodeList = adviceVerify(filterVO);
         ForkJoinPool myPool = new ForkJoinPool(4);
-        myPool.submit(() ->
-        doctorAdviceMedManageParams.parallelStream().forEach(adviceMedManageParam->{
-            String daItemName = adviceMedManageParam.getDaItemName();
-            String behospitalCode = adviceMedManageParam.getBehospitalCode();
-            String doctorAdviceType = adviceMedManageParam.getDoctorAdviceType();
-            //得到与手术相关
-            if(StringUtil.isNotEmpty(daItemName)) {
-                //当code存在于无首页code集合中
-                if (behospitalCodeList.contains(behospitalCode)) {
-                    //code也不存在于以保存的code集合
-                    if(!operationBehospitalCode.contains(behospitalCode)){
-                    String[][] operationList = QualityContent.OPERATION_LIST;
-                    Boolean stair = stairCondition(daItemName, operationList);
-                    if(stair) {
-                        String[][] operationArg = QualityContent.OPERATION_ARG;
-                        Boolean levelCondition = secondLevelCondition(daItemName, operationArg);
-                        if (levelCondition) {
-                            operationBehospitalCode.add(behospitalCode);
+        try {
+            myPool.submit(() ->
+            doctorAdviceMedManageParams.parallelStream().forEach(adviceMedManageParam->{
+                String daItemName = adviceMedManageParam.getDaItemName();
+                String behospitalCode = adviceMedManageParam.getBehospitalCode();
+                String doctorAdviceType = adviceMedManageParam.getDoctorAdviceType();
+                //得到与手术相关
+                if(StringUtil.isNotEmpty(daItemName)) {
+                    //当code存在于无首页code集合中
+                    if (behospitalCodeList.contains(behospitalCode)) {
+                        //code也不存在于以保存的code集合
+                        if(!operationBehospitalCode.contains(behospitalCode)){
+                        String[][] operationList = QualityContent.OPERATION_LIST;
+                        Boolean stair = stairCondition(daItemName, operationList);
+                        if(stair) {
+                            String[][] operationArg = QualityContent.OPERATION_ARG;
+                            Boolean levelCondition = secondLevelCondition(daItemName, operationArg);
+                            if (levelCondition) {
+                                operationBehospitalCode.add(behospitalCode);
+                            }
                         }
-                    }
-                  }
-                    if(!pathologyBehospitalCode.contains(behospitalCode)){
-                        Boolean condition = stairCondition(daItemName, QualityContent.BL_LIST);
-                        if (condition) {
-                            pathologyBehospitalCode.add(behospitalCode);
+                      }
+                        if(!pathologyBehospitalCode.contains(behospitalCode)){
+                            Boolean condition = stairCondition(daItemName, QualityContent.BL_LIST);
+                            if (condition) {
+                                pathologyBehospitalCode.add(behospitalCode);
+                            }
                         }
                     }
-                }
-                    //得到为临时医嘱
-                    if (StringUtil.isNotEmpty(doctorAdviceType)) {
-                        if (doctorAdviceType.equals(QualityContent.STAT_ORDER)) {
-                            if (!CTBehospitalCode.contains(behospitalCode)) {
-                                //筛选与CT相关
-                                //一级条件
-                                String[][] ctList = QualityContent.CT_LIST;
-                                Boolean stair = stairCondition(daItemName, ctList);
-                                if (stair) {
-                                    String[][] ctRegulation = QualityContent.CT_REGULATION;
-                                    Boolean levelCondition = secondLevelCondition(daItemName, ctRegulation);
-                                    if (levelCondition) {
-                                        CTBehospitalCode.add(behospitalCode);
+                        //得到为临时医嘱
+                        if (StringUtil.isNotEmpty(doctorAdviceType)) {
+                            if (doctorAdviceType.equals(QualityContent.STAT_ORDER)) {
+                                if (!CTBehospitalCode.contains(behospitalCode)) {
+                                    //筛选与CT相关
+                                    //一级条件
+                                    String[][] ctList = QualityContent.CT_LIST;
+                                    Boolean stair = stairCondition(daItemName, ctList);
+                                    if (stair) {
+                                        String[][] ctRegulation = QualityContent.CT_REGULATION;
+                                        Boolean levelCondition = secondLevelCondition(daItemName, ctRegulation);
+                                        if (levelCondition) {
+                                            CTBehospitalCode.add(behospitalCode);
+                                        }
                                     }
                                 }
-                            }
-                            //与MR相关
-                            if (!MRBehospitalCode.contains(behospitalCode)) {
-                                String[][] mrList = QualityContent.MR_LIST;
-                                Boolean stair = stairCondition(daItemName, mrList);
-                                if (stair) {
-                                    String[][] ctRegulation = QualityContent.CT_REGULATION;
-                                    Boolean levelCondition = secondLevelCondition(daItemName, ctRegulation);
-                                    if (levelCondition) {
-                                        MRBehospitalCode.add(behospitalCode);
+                                //与MR相关
+                                if (!MRBehospitalCode.contains(behospitalCode)) {
+                                    String[][] mrList = QualityContent.MR_LIST;
+                                    Boolean stair = stairCondition(daItemName, mrList);
+                                    if (stair) {
+                                        String[][] ctRegulation = QualityContent.CT_REGULATION;
+                                        Boolean levelCondition = secondLevelCondition(daItemName, ctRegulation);
+                                        if (levelCondition) {
+                                            MRBehospitalCode.add(behospitalCode);
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
+                }
+        })).get();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        }finally {
+            myPool.shutdown();
+            for (String operation : operationBehospitalCode) {
+                if(pathologyBehospitalCode.contains(operation)){
+                    operationPathologyBehospitalCode.add(operation);
+                }
             }
-    })).get();
-        myPool.shutdown();
-        for (String operation : operationBehospitalCode) {
-            if(pathologyBehospitalCode.contains(operation)){
-                operationPathologyBehospitalCode.add(operation);
+            if(ListUtil.isEmpty(CTBehospitalCode)){
+                map.put("CT",Long.valueOf(0));
+            }else {
+                map.put("CT",Long.valueOf(CTBehospitalCode.size()));
             }
+            if(ListUtil.isEmpty(MRBehospitalCode)){
+                map.put("MR",Long.valueOf(0));
+            }else {
+                map.put("MR",Long.valueOf(MRBehospitalCode.size()));
+            }
+            if(ListUtil.isEmpty(operationBehospitalCode)){
+                map.put("MR",Long.valueOf(0));
+            }else {
+                map.put("operation",Long.valueOf(operationBehospitalCode.size()));
+            }
+            if(ListUtil.isEmpty(operationPathologyBehospitalCode)){
+                map.put("operationPathology",Long.valueOf(0));
+            }else {
+                map.put("operationPathology",Long.valueOf(operationPathologyBehospitalCode.size()));
+            }
+            return map;
         }
-        if(ListUtil.isEmpty(CTBehospitalCode)){
-            map.put("CT",Long.valueOf(0));
-        }else {
-            map.put("CT",Long.valueOf(CTBehospitalCode.size()));
-        }
-        if(ListUtil.isEmpty(MRBehospitalCode)){
-            map.put("MR",Long.valueOf(0));
-        }else {
-            map.put("MR",Long.valueOf(MRBehospitalCode.size()));
-        }
-        if(ListUtil.isEmpty(operationBehospitalCode)){
-            map.put("MR",Long.valueOf(0));
-        }else {
-            map.put("operation",Long.valueOf(operationBehospitalCode.size()));
-        }
-        if(ListUtil.isEmpty(operationPathologyBehospitalCode)){
-            map.put("operationPathology",Long.valueOf(0));
-        }else {
-            map.put("operationPathology",Long.valueOf(operationPathologyBehospitalCode.size()));
-        }
-
-        return map;
     }