注释掉sql日志打印

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -160,7 +160,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/AfterwardsAuditDataTest.java

@@ -118,7 +118,7 @@ public class AfterwardsAuditDataTest {
     public void insertAfterWordDetail() {
         QueryWrapper<SttlMasterBill> queryWrapper = new QueryWrapper();
 //        queryWrapper.notIn("jsdjh","0182940007_20201202081355","111929226_20201124104538","20200914-3603991000-014606");
-        queryWrapper.isNull("state");
+//        queryWrapper.isNull("state");
         queryWrapper.last("limit 0,10");
         List<SttlMasterBill> sttlMasterBills = sttlMasterBillService.list(queryWrapper);
         List<AfterwardsAuditDetail> detailList = new ArrayList<>();
@@ -154,6 +154,49 @@ public class AfterwardsAuditDataTest {
             }
         }
 
+//        afterwardsAuditDetailService.saveBatch(detailList, 1000);
+    }
+
+    @Test
+    public void insertAfterWordDetailOne() {
+        QueryWrapper<SttlMasterBill> queryWrapper = new QueryWrapper();
+//        queryWrapper.notIn("jsdjh","0182940007_20201202081355","111929226_20201124104538","20200914-3603991000-014606");
+//        queryWrapper.isNull("state");
+        queryWrapper.last("limit 1,10");
+        List<SttlMasterBill> sttlMasterBills = sttlMasterBillService.list(queryWrapper);
+        List<AfterwardsAuditDetail> detailList = new ArrayList<>();
+        Map<String, Boolean> codeDataMap = new ConcurrentHashMap<>();
+        String[] sAr = {"1", "2","3"};
+        List<MedicalInsRuleInfo> medicalInsRuleInfoList = medicalInsRuleInfoService.lambdaQuery().in(MedicalInsRuleInfo::getTreatmentType, sAr).eq(MedicalInsRuleInfo::getState, Constant.EFF_STATE).list();
+        if (!CollectionUtil.isNotEmpty(medicalInsRuleInfoList)) {
+            log.error("规则配置表没有有效的规则");
+            return;
+        }
+        /*
+         * 根据规则id加载规则并初始化到redis里
+         * 后续提醒通过redis加载id，把id传入规则引擎，迅速调用对应规则
+         */
+//        List<MedicalInsRuleInfo> midMedicalInsRuleInfoList = new ArrayList<>();
+        Map<Integer, MedicalInsRuleInfo> medicalMap = new HashMap<>();
+        for (MedicalInsRuleInfo medicalInsRuleInfo : medicalInsRuleInfoList) {
+            medicalMap.put(medicalInsRuleInfo.getId(), medicalInsRuleInfo);
+        }
+        for (SttlMasterBill sttlMasterBill : sttlMasterBills) {
+            AfterwardsAudit afterwardsAudit = afterwardsAuditService.lambdaQuery().eq(AfterwardsAudit::getPrescriptionNumber, sttlMasterBill.getJsdjh()).one();
+            if (null == afterwardsAudit) {
+                log.error("结算单据号找不到稽核单:{}", sttlMasterBill.getJsdjh());
+                continue;
+            }
+            List<SttlMasterDetailBill> sttlMasterDetailBills = sttlMasterDetailBillService.lambdaQuery().eq(SttlMasterDetailBill::getJsdjh, sttlMasterBill.getJsdjh()).list();
+            if (CollectionUtil.isNotEmpty(sttlMasterBills)) {
+
+                for (SttlMasterDetailBill sttlMasterDetailBill : sttlMasterDetailBills) {
+
+                    genData(sttlMasterDetailBill, codeDataMap, afterwardsAudit, medicalInsRuleInfoList, medicalMap);
+                }
+            }
+        }
+
 //        afterwardsAuditDetailService.saveBatch(detailList, 1000);
     }
 

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/MidAuditDataTest.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.medical.entity.MedicalInsRuleInfo;
 import org.jeecg.modules.medical.entity.MedicalInsRuleProject;
 import org.jeecg.modules.medical.entity.MidIncidentAudit;
 import org.jeecg.modules.medical.entity.MidIncidentAuditDetail;
+import org.jeecg.modules.medical.entity.MidIncidentAuditDiagnose;
 import org.jeecg.modules.medical.entity.SttlMasterBill;
 import org.jeecg.modules.medical.entity.SttlMasterDetailBill;
 import org.jeecg.modules.medical.job.AfterWaringLogTestJob;
@@ -118,6 +119,8 @@ public class MidAuditDataTest {
     IMidIncidentAuditDetailService midIncidentAuditDetailService;
     @Autowired
     IMidIncidentAuditDiagnoseService midIncidentAuditDiagnoseService;
+    @Autowired
+//    IMidIncidentAuditDiagnoseService midIncidentAuditDiagnoseService;
     @Test
     public void testJob() {
         try {
@@ -127,9 +130,32 @@ public class MidAuditDataTest {
         }
     }
 
+    @Test
+    public void genMidDiag(){
+        List<MidIncidentAudit> midIncidentAuditList = midIncidentAuditService.lambdaQuery().eq(MidIncidentAudit::getPatientId, "2222941236").list();
+        List<MidIncidentAuditDiagnose> midIncidentAuditDiagnoseList = new ArrayList<>();
+        MidIncidentAuditDiagnose midIncidentAuditDiagnose = null;
+        for(MidIncidentAudit midIncidentAudit : midIncidentAuditList){
+            midIncidentAuditDiagnose = new MidIncidentAuditDiagnose();
+            SttlMasterBill sttlMasterBill = sttlMasterBillService.lambdaQuery().eq(SttlMasterBill::getJsdjh, midIncidentAudit.getPrescriptionNumber()).list().get(0);
+            midIncidentAuditDiagnose.setMidIncidentAuditId(midIncidentAudit.getId());
+            midIncidentAuditDiagnose.setDiagnoseCode(sttlMasterBill.getCyzdbm());
+            midIncidentAuditDiagnose.setDiagnoseDesc(sttlMasterBill.getCyzdmc());
+            midIncidentAuditDiagnose.setMedDiagnoseCode(sttlMasterBill.getRyzdbm());
+            midIncidentAuditDiagnose.setMedDiagnoseDesc(sttlMasterBill.getRyksmc());
+            midIncidentAuditDiagnose.setPrescriptionNumber(midIncidentAudit.getPrescriptionNumber());
+            midIncidentAuditDiagnose.setOutpatientNumber(midIncidentAudit.getOutpatientNumber());
+            midIncidentAuditDiagnose.setCreateTime(new Date());
+            midIncidentAuditDiagnoseList.add(midIncidentAuditDiagnose);
+        }
+        midIncidentAuditDiagnoseService.saveBatch(midIncidentAuditDiagnoseList, 1000);
+    }
+
     @Test
     public void getAfterToMid(){
-        List<AfterwardsAudit> afterwardsAuditList = afterwardsAuditService.list();
+        log.info("进入查询");
+        List<AfterwardsAudit> afterwardsAuditList = afterwardsAuditService.lambdaQuery().eq(AfterwardsAudit::getPatientId,"2222941236").list();
+        log.info("数据条数：{}", afterwardsAuditList.size());
         MidIncidentAudit midIncidentAudit = new MidIncidentAudit();
         List<MidIncidentAudit> midIncidentAuditList = new ArrayList<>();
         for(AfterwardsAudit audit : afterwardsAuditList){
@@ -165,6 +191,7 @@ public class MidAuditDataTest {
             midIncidentAudit.setMedicalDeptCode(audit.getMedicalDeptCode());
             midIncidentAudit.setOutpatientNumber(audit.getOutpatientNumber());
             midIncidentAuditList.add(midIncidentAudit);
+            log.info("midIncident:{}", midIncidentAudit);
         }
         midIncidentAuditService.saveBatch(midIncidentAuditList, 1000);
     }