Merge remote-tracking branch 'origin/master'

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -26,14 +26,13 @@ public class BEH0011 extends QCCatalogue {
     @Autowired
     private RedisUtil redisUtil;
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-
+        Map<String, Map<String, Object>> diagMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
         String initDiagText = CatalogueUtil.removeSpecialChar(inputInfo.getBeHospitalizedDoc().getInitialDiagLabel().getText());
         List<Diag> diags = inputInfo.getBeHospitalizedDoc().getPastLabel().getDiags();
         if(StringUtils.isNotEmpty(initDiagText)){
             List<String> initDiags = Arrays.asList(initDiagText.split(","));
             if(diags.size()>0){
                 for (Diag diag:diags) {
-                    Map<String, Map<String, Object>> diagMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
                     Map<String, Object> map = (Map<String, Object>) diagMap.get(diag.getName());
                     if(map != null || map.size() >0){
                         String chronic = (String) map.get("chronic");//1是慢病

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0014.java

@@ -27,7 +27,12 @@ public class BEH0014 extends QCCatalogue {
             String clinicalName = clinical.getName();
             Cause cause = clinical.getCause();
             if(cause == null){
-                info.set(clinicalName);
+                int causeIndex = inputInfo.getBeHospitalizedDoc().getPresentLabel().getText().indexOf("因");
+                if (causeIndex < 15) {
+                    status.set("0");
+                } else {
+                    info.set(clinicalName);
+                }
             }else {
                 status.set("0");
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0414.java

@@ -23,7 +23,7 @@ public class BEH0414 extends QCCatalogue {
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
         if(structureMap != null && firstStructMap != null){
-            String contactAddress_bh = structureMap.get("年龄");
+            String contactAddress_bh = structureMap.get("年龄").replace("岁","");
             String contactAddress_first = firstStructMap.get(Content.age);
             if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
                 if(!contactAddress_first.equals(contactAddress_bh)){

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0439.java

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.DateUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -27,7 +28,7 @@ public class BEH0439 extends QCCatalogue {
             String birthDate_fpr = fprMap.get("出生日期");
             if(birthDate_bh != null && birthDate_fpr != null){
                 if(!CatalogueUtil.isEmpty(birthDate_bh) && !CatalogueUtil.isEmpty(birthDate_fpr)){
-                    if(!birthDate_bh.equals(birthDate_fpr)){
+                    if(!DateUtil.format(DateUtil.parseDate(birthDate_bh),DateUtil.DATE_FORMAT).equals(DateUtil.format(DateUtil.parseDate(birthDate_fpr),DateUtil.DATE_FORMAT))){
                         status.set("-1");
                     }
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0441.java

@@ -22,7 +22,7 @@ public class BEH0441 extends QCCatalogue {
         List<GeneralDesc> generals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGenerals();
         if(generals.size() > 0 || generals != null){
             for (GeneralDesc general:generals) {
-                if(general.getName().contains("纳可")){
+                if(general.getName().contains("纳")){
                     status.set("0");
                     break;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0300.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 @Component
 public class CLI0300 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
+        status.set("-1");
         List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
@@ -34,8 +34,8 @@ public class CLI0300 extends QCCatalogue {
                     if (matcher.find(0)){
                         if (null!=matcher.group(1)) {
                             Double val = Double.parseDouble(matcher.group(1));
-                            if (val > 60.0) {
-                                status.set("-1");
+                            if (val <= 60.0) {
+                                status.set("0");
                             }
                         }
                     }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/AIAnalyze.java

@@ -25,11 +25,30 @@ public class AIAnalyze {
     }
 
     public void aiProcess(InputInfo inputInfo) {
+        long start = System.currentTimeMillis();
         beHospitalizedAI.medrec(inputInfo, crfServiceClient);
+        long end = System.currentTimeMillis();
+        System.out.println("入院记录 AI处理....." + (end - start));
+        start = System.currentTimeMillis();
+
         firstCourseRecordAI.medrec(inputInfo, crfServiceClient, similarityServiceClient);
+        end = System.currentTimeMillis();
+        System.out.println("首次病程录 AI处理....." + (end - start));
+        start = System.currentTimeMillis();
+
         leaveHospitalAI.medrec(inputInfo, crfServiceClient);
+        end = System.currentTimeMillis();
+        System.out.println("出院小结 AI处理....." + (end - start));
+        start = System.currentTimeMillis();
+
         threeLevelWardAI.medrec(inputInfo, crfServiceClient);
+        end = System.currentTimeMillis();
+        System.out.println("三级查房 AI处理....." + (end - start));
+        start = System.currentTimeMillis();
+
         operationAI.medrec(inputInfo, crfServiceClient);
+        end = System.currentTimeMillis();
+        System.out.println("手术 AI处理....." + (end - start));
     }
 
 

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/model/EntityEnum.java

@@ -15,7 +15,7 @@ public enum EntityEnum {
     OPERATION_KEYWORD("手术史"), OPERATION_RESULT("手术结果"), INJURY("外伤史"), ALLERGY("过敏"),
     FOOD_ALLERGY("食物过敏原"), DRUG_ALLERGY("药物过敏原"), ALLERGY_SYMPTOM("过敏表现"), BLOOD_TRANSFUSION("输血史"),
     TRANSFUSION_REACTION("输血反应"), VACCINATION("预防接种史"), DISEASE_KEYWORD("疾病史"), INFECTIOUS_KEYWORD("传染病史"),
-    UNKNOWN("情况不详"), HEALTH("健康情况"), AGE("年龄"), SMOKING_HISTORY("吸烟史"),
+    UNKNOWN("情况不详"), HEALTH("健康状况"), AGE("年龄"), SMOKING_HISTORY("吸烟史"),
     HISTORY_OF_ALCOHOL_INTAKE("饮酒史"), USAGE("用量"), MENSES("月经"), LEUKORRHEA("白带"),
     BIRTH_HIS("生育情况"), CONJUGAL_RELATION("夫妻关系"), RELATIVES("家属"), GROUP_CONSULTATION("会诊"), ORGANISM("生物体"),
     OCCUPATION("职业"), LOCATION("地点"), DEAD("死亡"), DEAD_REASON("死亡原因"),

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcess.java

@@ -94,9 +94,9 @@ public class EntityProcess {
             for (Relation relation : connectEntityIdList) {
                 if (l.getId() == relation.getId()) {
                     l.setRelationName(relation.getRelationName());
-//                    if (!hasRelation(l.getId(), lemma.getId(), relationIds)) {
-//                        findRelationLemma(l, allLemmaList, relations, relationIds);
-//                    }
+                    if (!hasRelation(l.getId(), lemma.getId(), relationIds)) {
+                        findRelationLemma(l, allLemmaList, relations, relationIds);
+                    }
                     lemma.addRelationLemmas(l);
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessClinic.java

@@ -92,6 +92,16 @@ public class EntityProcessClinic extends EntityProcess {
             }
             presentLabel.setTreats(treats);
 
+            //时间
+            List<Lemma> pdLemmas = createEntityTree(aiOut, EntityEnum.TIME.toString());
+            List<PD> pds = new ArrayList<>();
+            for (Lemma lemma : pdLemmas) {
+                PD pd = new PD();
+                pd.setName(lemma.getText());
+                pds.add(pd);
+            }
+            presentLabel.setPds(pds);
+
         } catch (Exception e) {
             e.printStackTrace();
             logger.error(e.getMessage(), e);

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessMarital.java

@@ -37,6 +37,13 @@ public class EntityProcessMarital extends EntityProcess {
             marryiage.setName(lemma.getText());
             maritalLabel.setMarryiage(marryiage);
         }
+        //读取结婚年龄所有本体及关联信息
+        List<Lemma> ageLemmas = createEntityTree(aiOut, EntityEnum.AGE.toString());
+        for (Lemma lemma :ageLemmas) {
+            Marryiage marryiage = new Marryiage();
+            marryiage.setName(lemma.getText());
+            maritalLabel.setMarryiage(marryiage);
+        }
         //婚姻情况描述
         List<Lemma> maritalStatusLemmas = createEntityTree(aiOut, EntityEnum.MARITAL_STATUS.toString());
         for (Lemma lemma :maritalStatusLemmas) {

kernel/src/main/java/com/lantone/qc/kernel/web/controller/QCTestController.java

@@ -11,6 +11,7 @@ import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.res.Response;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.PropertiesUtil;
+import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -69,8 +70,9 @@ public class QCTestController {
         for (Map.Entry<String, QueryVo> entry : queryVoMap.entrySet()) {
             System.out.println("患者就诊号：" + entry.getKey() + "..........");
 //            modelDataUtil.executor(entry.getKey(), entry.getValue());//AI所需模块数据存入DB
+            long start = System.currentTimeMillis();
             OutputInfo outputInfo = qCAnalysis.anlysis(entry.getValue());
-
+            System.out.println("耗时......." + (System.currentTimeMillis() - start));
             Map<String, String> passMap = inputCaseMappingMap.get(entry.getKey());
             if (passMap != null) {
                 for (Map.Entry<String, String> e : passMap.entrySet()) {
@@ -150,7 +152,7 @@ public class QCTestController {
                 modeIds.add(r1);
             }
 
-            sql = "select code, name, precond from qc_cases_entry q1, qc_cases_entry_hospital q2 where q1.id = q2.cases_entry_id ";   //查询所有条目
+            sql = "select code, name, precond from qc_cases_entry q1, qc_cases_entry_hospital q2 where q1.id = q2.cases_entry_id and q2.is_used = 1 ";   //查询所有条目
             if (StringUtils.isNotEmpty(hospitalId)) {
                 sql = sql + " and q2.hospital_id = " + hospitalId;
             }
@@ -200,7 +202,13 @@ public class QCTestController {
                     MedrecVo medrecVo = new MedrecVo();
                     medrecVo.setTitle(label);
                     String jsonString = details.get(0);
-                    medrecVo.setContent(FastJsonUtils.getJsonToMap(jsonString));
+                    if ("1".equals(hospitalId)) {
+                        medrecVo.setContent(FastJsonUtils.getJsonToMap(jsonString));
+                    } else {
+                        Map<String, Object> m = new HashMap<>();
+                        m.put("content", details);
+                        medrecVo.setContent(m);
+                    }
                     medrec.add(medrecVo);
                     details = new ArrayList<>();
                 } else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {

kernel/src/test/java/com/lantone/qc/kernel/TaizDataImportApiTest.java

@@ -27,8 +27,8 @@ import java.util.zip.GZIPInputStream;
  * @Date: 2020-03-31 19:34
  */
 public class TaizDataImportApiTest {
-    private static String hospitalId = "1";
-    private static String cid = "changx";
+    private static String hospitalId = "3";
+    private static String cid = "taizhou";
 
     private Map<String,String> caseMap = new HashMap<>();
     private List<String> deletePatient = new ArrayList<>();
@@ -62,7 +62,7 @@ public class TaizDataImportApiTest {
         test.loadModelHospital();
         //患者信息
         test.insertPatient(test.loadOraclePatients(tableMap.get("BR_INPATIENTINFO")));
-        test.insertDoctor(test.loadOracleDoctorInfos(tableMap.get("GI_USERINFO"), tableMap.get("HI_DEPTINFO")));
+//        test.insertDoctor(test.loadOracleDoctorInfos(tableMap.get("GI_USERINFO"), tableMap.get("HI_DEPTINFO")));
 
         //病人流水号获取    病历号--->id
         Map<String, String> patientMap = test.loadPatients(hospitalId);
@@ -79,7 +79,7 @@ public class TaizDataImportApiTest {
             patientMap.put("hospital_id", hospitalId);
             list.add(patientMap);
         }
-        initMysqlJdbc().insert(list, "qc_cases_number_copy", new String[]{"hospital_id", "case_number"});
+        initMysqlJdbc().insert(list, "qc_cases_number", new String[]{"hospital_id", "case_number"});
     }
 
     private void insertDoctor(List<Doctor> doctors) {
@@ -101,59 +101,59 @@ public class TaizDataImportApiTest {
         for (Map.Entry<String, String> entry : patientMap.entrySet()) {
             List<PatientText> patientTexts = new ArrayList<>();
             //病人的病案首页内容
-            List<Map<String, Object>> homePageList = DataTest.loadHomePage(tableMap.get("BR_RECHOME"), entry.getKey());
-            if (homePageList == null || homePageList.isEmpty()) { //没病案首页直接不导入
-                deletePatient.add(entry.getKey()); //没病案首页的患者也要删除
-                continue;
-            }
-            Map<String, Object> homePageMap = homePageList.get(0);
-            homePageMap.put("门急诊诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"), "1", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("出院诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"2", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("损伤、中毒外部原因", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"3", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("病理诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"), "4", entry.getKey())).replaceAll("\"", "'"));
-            homePageMap.put("手术信息", FastJsonUtils.getBeanToJson(DataTest.loadHomePageOperation(tableMap.get("BR_RECOPERATION"), tableMap.get("GI_USERINFO"), entry.getKey())).replaceAll("\"", "'"));
-
-            Map<String, Object> firstPageTextMap = new HashMap<>();
-            firstPageTextMap.put("case_number", entry.getKey());
-            firstPageTextMap.put("case_number_id", patientMap.get(entry.getKey()));
-            firstPageTextMap.put("hospital_id", hospitalId);
-            firstPageTextMap.put("mode_id", 6);
-            firstPageTextMap.put("origin_mode", "病案首页");
-            firstPageTextMap.put("origin_text", FastJsonUtils.getBeanToJson(homePageMap));
-            String pagetext = "";
-            for (Map.Entry<String, Object> e : homePageMap.entrySet()) {
-                pagetext = pagetext + "【" + e.getKey() + "】：" + e.getValue().toString() + "\n";
-            }
-            firstPageTextMap.put("text", pagetext);
+//            List<Map<String, Object>> homePageList = DataTest.loadHomePage(tableMap.get("BR_RECHOME"), entry.getKey());
+//            if (homePageList == null || homePageList.isEmpty()) { //没病案首页直接不导入
+//                deletePatient.add(entry.getKey()); //没病案首页的患者也要删除
+//                continue;
+//            }
+//            Map<String, Object> homePageMap = homePageList.get(0);
+//            homePageMap.put("门急诊诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"), "1", entry.getKey())).replaceAll("\"", "'"));
+//            homePageMap.put("出院诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"2", entry.getKey())).replaceAll("\"", "'"));
+//            homePageMap.put("损伤、中毒外部原因", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"),"3", entry.getKey())).replaceAll("\"", "'"));
+//            homePageMap.put("病理诊断", FastJsonUtils.getBeanToJson(DataTest.loadHomePageDiagnose(tableMap.get("BR_RECDIAGNOSE"), "4", entry.getKey())).replaceAll("\"", "'"));
+//            homePageMap.put("手术信息", FastJsonUtils.getBeanToJson(DataTest.loadHomePageOperation(tableMap.get("BR_RECOPERATION"), tableMap.get("GI_USERINFO"), entry.getKey())).replaceAll("\"", "'"));
+//
+//            Map<String, Object> firstPageTextMap = new HashMap<>();
+//            firstPageTextMap.put("case_number", entry.getKey());
+//            firstPageTextMap.put("case_number_id", patientMap.get(entry.getKey()));
+//            firstPageTextMap.put("hospital_id", hospitalId);
+//            firstPageTextMap.put("mode_id", 6);
+//            firstPageTextMap.put("origin_mode", "病案首页");
+//            firstPageTextMap.put("origin_text", FastJsonUtils.getBeanToJson(homePageMap));
+//            String pagetext = "";
+//            for (Map.Entry<String, Object> e : homePageMap.entrySet()) {
+//                pagetext = pagetext + "【" + e.getKey() + "】：" + e.getValue().toString() + "\n";
+//            }
+//            firstPageTextMap.put("text", pagetext);
             if ("changx".equals(cid)) {
                 patientTexts = loadChangxOraclePatientTexts(entry.getKey());
             }
             if ("taizhou".equals(cid)) {
                 patientTexts = loadTaizhouOraclePatientTexts(entry.getKey());
             }
-            if (!wholePatientRecord(patientTexts, modelMap) || patientTexts.size() == 0) {
+            if (patientTexts.size() == 0 || !wholePatientRecord(patientTexts, modelMap)) {
                 continue;
             }
             //数据完整后才放入病案首页
-            list.add(firstPageTextMap);
+//            list.add(firstPageTextMap);
 
             //病人医嘱信息
-            List<Map<String, Object>> docAdviceMap = DataTest.loadHomePage(tableMap.get("BR_DOCTADVICE"), entry.getKey());
-            for (Map<String, Object> docMap : docAdviceMap) {
-                Map<String, Object> docAdviceTextMap = new HashMap<>();
-                docAdviceTextMap.put("case_number", entry.getKey());
-                docAdviceTextMap.put("case_number_id", patientMap.get(entry.getKey()));
-                docAdviceTextMap.put("hospital_id", hospitalId);
-                docAdviceTextMap.put("mode_id", 8);
-                docAdviceTextMap.put("origin_mode", "医嘱信息");
-                docAdviceTextMap.put("origin_text", FastJsonUtils.getBeanToJson(docMap));
-                pagetext = "";
-                for (Map.Entry<String, Object> e : docMap.entrySet()) {
-                    pagetext = pagetext + "【" + e.getKey() + "】：" + e.getValue().toString() + "\n";
-                }
-                docAdviceTextMap.put("text", pagetext);
-                list.add(docAdviceTextMap);
-            }
+//            List<Map<String, Object>> docAdviceMap = DataTest.loadHomePage(tableMap.get("BR_DOCTADVICE"), entry.getKey());
+//            for (Map<String, Object> docMap : docAdviceMap) {
+//                Map<String, Object> docAdviceTextMap = new HashMap<>();
+//                docAdviceTextMap.put("case_number", entry.getKey());
+//                docAdviceTextMap.put("case_number_id", patientMap.get(entry.getKey()));
+//                docAdviceTextMap.put("hospital_id", hospitalId);
+//                docAdviceTextMap.put("mode_id", 8);
+//                docAdviceTextMap.put("origin_mode", "医嘱信息");
+//                docAdviceTextMap.put("origin_text", FastJsonUtils.getBeanToJson(docMap));
+//                pagetext = "";
+//                for (Map.Entry<String, Object> e : docMap.entrySet()) {
+//                    pagetext = pagetext + "【" + e.getKey() + "】：" + e.getValue().toString() + "\n";
+//                }
+//                docAdviceTextMap.put("text", pagetext);
+//                list.add(docAdviceTextMap);
+//            }
             //病人其他文书信息
             for (PatientText patientText : patientTexts) {
                 Map<String, Object> patientTextMap = new HashMap<>();
@@ -182,7 +182,7 @@ public class TaizDataImportApiTest {
                 list.add(patientTextMap);
             }
         }
-        initMysqlJdbc().insert(list, "qc_model_mapping_copy", new String[]{"case_number", "case_number_id", "origin_text", "mode_id", "text", "origin_mode"});
+        initMysqlJdbc().insert(list, "qc_model_mapping", new String[]{"case_number", "case_number_id", "origin_text", "mode_id", "text", "origin_mode"});
 
         deletePatientInfos(deletePatient);
     }
@@ -279,8 +279,8 @@ public class TaizDataImportApiTest {
         List<PatientText> patientTexts = new ArrayList<>();
         try {
             st = conn.createStatement();
-            String sql = "select brzyid,bljlmc,bljlnr from mr_medicalrecords_TZ20200330 a " +
-                    "left join mr_mrcontent_TZ20200330 b on a.bljlid=b.bljlid " +
+            String sql = "select brzyid,bljlmc,bljlnr from mr_medicalrecords_TZ a " +
+                    "left join mr_mrcontent_TZ b on a.bljlid=b.bljlid " +
                     "where bljlnr is not null and brzyid = '" + brzyid + "' " +
                     "order by brzyid";
             rs = st.executeQuery(sql);

public/src/main/java/com/lantone/qc/pub/model/label/PresentLabel.java

@@ -30,6 +30,8 @@ public class PresentLabel extends GeneralLabel {
     private List<Diag> diags = new ArrayList<>();
     //入院途径
     private BeHospitalizedWay beHospitalizedWay;
+    //现病史中所有时间实体存入
+    private List<PD> pds = new ArrayList<>();
 
     public <T> void add(List<T> list, T obj) {
         list.add(obj);

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDocTrans.java

@@ -11,7 +11,7 @@ import com.lantone.qc.trans.DocTrans;
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:47
  */
-public class TaiZhouDocTrans extends DocTrans {
+public class TaizhouDocTrans extends DocTrans {
 
     @Override
     protected InputInfo extract(QueryVo queryVo) {