Explorar el Código

合并既往史:既往史+传染病史+手术外伤史+过敏史+接种史

zhoutg hace 4 años
padre
commit
95c2adfb59
Se han modificado 1 ficheros con 18 adiciones y 2 borrados
  1. 18 2
      src/main/java/com/diagbot/facade/CommonFacade.java

+ 18 - 2
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -73,6 +73,22 @@ public class CommonFacade {
     //组装好的label
     public WordCrfDTO crf_process(SearchData searchData) {
         AIAnalyze aiAnalyze = new AIAnalyze(crfServiceClient);
+        // 合并既往史:既往史+传染病史+手术外伤史+过敏史+接种史
+        String unionPasts = searchData.getPasts();
+        if (StringUtil.isNotBlank(searchData.getInfectious())) { // 传染病史
+            unionPasts = unionPasts + "。"  + searchData.getInfectious();
+        }
+        if (StringUtil.isNotBlank(searchData.getSurgical())) { // 手术外伤史
+            unionPasts = unionPasts + "。"  + searchData.getSurgical();
+        }
+        if (StringUtil.isNotBlank(searchData.getAllergy())) { // 过敏史
+            unionPasts = unionPasts + "。"  + searchData.getAllergy();
+        }
+        if (StringUtil.isNotBlank(searchData.getVaccination())) { // 接种史
+            unionPasts = unionPasts + "。"  + searchData.getVaccination();
+        }
+        searchData.setPasts(unionPasts);
+
         WordCrfDTO wordCrfDTO = new WordCrfDTO();
         wordCrfDTO.setHospitalId(searchData.getHospitalId());
         // 年龄容错处理
@@ -129,8 +145,8 @@ public class CommonFacade {
         if (StringUtil.isNotBlank(searchData.getChief())) {
             wordCrfDTO.setChief(searchData.getChief());
         }
-        if (StringUtil.isNotBlank(searchData.getPasts())) {
-            wordCrfDTO.setPasts(searchData.getPasts());
+        if (StringUtil.isNotBlank(unionPasts)) {
+            wordCrfDTO.setPasts(unionPasts);
         }
         if (StringUtil.isNotBlank(searchData.getMenstrual())) {
             wordCrfDTO.setMenstrual(searchData.getMenstrual());