Merge remote-tracking branch 'origin/dev/importDiagnose20210429' into dev/importDiagnose20210429

src/main/java/com/diagbot/enums/DiagnoseLexiconTypeEnum.java

@@ -26,12 +26,12 @@ public enum DiagnoseLexiconTypeEnum implements KeyedNamed {
     VitalResultTpye(2, "B:体格检查结果"),
 //    VitalTpye(104, "C"),
     LisSubNameTpye(3, "D:实验室检查子项目"),
-    PacsResultTpye(4, "E:辅助检查结果"),
+    PacsResultTpye(4, "E:辅助检查结果正则"),
     DiseaseTpye(5, "F:疾病"),
     DiseaseHisTpye(6, "F:疾病"),//病史
     ZsxbszzTpyeCause(7, "G:主诉现病史正则"),//诱因
     ZsxbszzTpyeBc(8, "G:主诉现病史正则"),//病程
-    jwzzTpye(9, "H:既往正则"),
+    jwzzTpye(9, "H:既往史正则"),
     QuezhenTpye(91, "确诊"),
     NizhenTpye(92, "拟诊"),
     JtTpye(93, "警惕");

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

@@ -187,7 +187,7 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
                         exportDiagnoseDTO.setRule(kdl.getStandard());
                     }
                     if(code.startsWith("4.")){
-                        exportDiagnoseDTO.setRule(kdl.getRelation());
+                        exportDiagnoseDTO.setRule(kdl.getRelation().replaceAll("\\、","|"));
                         exportDiagnoseDTO.setRelation(kdl.getStandard());
                     }
                     exportDiagnoseDTO.setEq(kdl.getMidResult());