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

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

@@ -39,6 +39,7 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
         Map<String, List<KlDiagnoseDetail>> diagnoseDetailMap = EntityUtil.makeEntityListMap(klDiagnoseDetailList, "disName");
         // TODO 获取公式，分隔编码，替换编码，组装导出数据  Map<String, List<ExportDiagnoseDTO>>
         Map<String, List<ExportDiagnoseDTO>> diagnoseDetails = processDiagnoseDetail(diagnoseDetailMap);
+        System.out.println();
 
 
         // 导出数据
@@ -69,15 +70,22 @@ public class KlDiagnoseDetailFacade extends KlDiagnoseDetailServiceImpl {
             removeKlDiagnoseDetail(datats);
             List<ExportDiagnoseDTO> eds = Lists.newArrayList();
             for (KlDiagnoseDetail kdl:datats) {
+                Integer type = kdl.getType();
+                String code = kdl.getCode();
                 ExportDiagnoseDTO exportDiagnoseDTO = new ExportDiagnoseDTO();
                 BeanUtil.copyProperties(kdl, exportDiagnoseDTO);
-                ReflectUtil.setProperty(exportDiagnoseDTO, "type", kdl.getType().toString());
-                ReflectUtil.setProperty(exportDiagnoseDTO, "orderNo", kdl.getCode());
-                if(kdl.getCode().startsWith("3.")){
+                ReflectUtil.setProperty(exportDiagnoseDTO, "type", type.toString());
+                ReflectUtil.setProperty(exportDiagnoseDTO, "orderNo", code);
+                if(code.startsWith("3.") || code.startsWith("4.")){
                     exportDiagnoseDTO.setRule(kdl.getRelation());
+                    exportDiagnoseDTO.setRelation("");
                 }else {
                     exportDiagnoseDTO.setRule(kdl.getStandard());
                 }
+                if(type == 91 || type == 92 || type == 93){
+                    exportDiagnoseDTO.setRule(kdl.getFormula());
+                }
+
                 exportDiagnoseDTO.setEq(kdl.getMidResult());
                 exportDiagnoseDTO.setType("1223");
                 eds.add(exportDiagnoseDTO);