问诊模板获取

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

@@ -60,6 +60,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         Map<String, List<QuestionModuleInfoDTO>> map = new HashMap<>();
         List<QuestionModuleInfoDTO> list1 = new ArrayList<>();
         List<QuestionModuleInfoDTO> list2 = new ArrayList<>();
+        if (moduleInfoVO.getId().contains("1") && moduleInfoVO.getId().contains("2") && !moduleInfoVO.getId().contains("12")) {
+            moduleInfoVO.setId(null);
+        }
         List<QuestionModuleInfoDTO> moduleById = this.getModuleByIds(moduleInfoVO);
         if (ListUtil.isEmpty(moduleById)) {
             return map;
@@ -90,69 +93,68 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         StringBuilder coughAggravateTimeStr = new StringBuilder(); //咳嗽加重时间
         StringBuilder sputumTimeStr = new StringBuilder(); //咳痰主时间
         StringBuilder sputumAggravateTimeStr = new StringBuilder(); //咳痰加重时间
-        if (moduleDetaillVO.getId() == 0) {
-            //咳嗽主时间
-            if (StringUtil.isNotBlank(moduleDetaillVO.getCoughTime()) && StringUtil.isNotBlank(moduleDetaillVO.getCoughTimeUnit())) {
-                coughTimeStr.append(moduleDetaillVO.getCoughTime() + moduleDetaillVO.getCoughTimeUnit());
-            }
+        //咳嗽主时间
+        if (StringUtil.isNotBlank(moduleDetaillVO.getCoughTime()) && !"0".equals(moduleDetaillVO.getCoughTime()) && StringUtil.isNotBlank(moduleDetaillVO.getCoughTimeUnit())) {
+            coughTimeStr.append(moduleDetaillVO.getCoughTime() + moduleDetaillVO.getCoughTimeUnit());
+        }
 
-            //咳嗽加重时间
-            if (StringUtil.isNotBlank(moduleDetaillVO.getCoughAggravateTime()) && StringUtil.isNotBlank(moduleDetaillVO.getCoughAggravateTimeUnit())) {
-                coughAggravateTimeStr.append(moduleDetaillVO.getCoughAggravateTime() + moduleDetaillVO.getCoughAggravateTimeUnit());
-            }
+        //咳嗽加重时间
+        if (StringUtil.isNotBlank(moduleDetaillVO.getCoughAggravateTime()) && !"0".equals(moduleDetaillVO.getCoughAggravateTime()) && StringUtil.isNotBlank(moduleDetaillVO.getCoughAggravateUnit())) {
+            coughAggravateTimeStr.append(moduleDetaillVO.getCoughAggravateTime() + moduleDetaillVO.getCoughAggravateUnit());
+        }
 
-            //咳痰主时间
-            if (StringUtil.isNotBlank(moduleDetaillVO.getSputumTime()) && StringUtil.isNotBlank(moduleDetaillVO.getSputumTimeUnit())) {
-                sputumTimeStr.append(moduleDetaillVO.getSputumTime() + moduleDetaillVO.getSputumTimeUnit());
-            }
+        //咳痰主时间
+        if (StringUtil.isNotBlank(moduleDetaillVO.getSputumTime()) && !"0".equals(moduleDetaillVO.getSputumTime()) && StringUtil.isNotBlank(moduleDetaillVO.getSputumTimeUnit())) {
+            sputumTimeStr.append(moduleDetaillVO.getSputumTime() + moduleDetaillVO.getSputumTimeUnit());
+        }
 
-            //咳痰加重时间
-            if (StringUtil.isNotBlank(moduleDetaillVO.getSputumAggravateTime()) && StringUtil.isNotBlank(moduleDetaillVO.getSputumAggravateTimeUnit())) {
-                sputumAggravateTimeStr.append(moduleDetaillVO.getSputumAggravateTime() + moduleDetaillVO.getSputumAggravateTimeUnit());
-            }
+        //咳痰加重时间
+        if (StringUtil.isNotBlank(moduleDetaillVO.getSputumAggravateTime()) && !"0".equals(moduleDetaillVO.getSputumAggravateTime()) && StringUtil.isNotBlank(moduleDetaillVO.getSputumAggravateTimeUnit())) {
+            sputumAggravateTimeStr.append(moduleDetaillVO.getSputumAggravateTime() + moduleDetaillVO.getSputumAggravateTimeUnit());
+        }
 
-            //存在咳嗽和咳痰
-            if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isNotBlank(sputumTimeStr.toString()) && StringUtil.isNotBlank(coughAggravateTimeStr.toString()) && StringUtil.isNotBlank(sputumAggravateTimeStr.toString())) {
-                if (coughTimeStr.toString().equals(sputumTimeStr.toString()) && coughAggravateTimeStr.toString().equals(sputumAggravateTimeStr.toString())) {
-                    chiefSb.append("咳嗽、咳痰" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "。");
-                } else if (coughTimeStr.toString().equals(sputumTimeStr.toString()) && !coughAggravateTimeStr.toString().equals(sputumAggravateTimeStr.toString())) {
-                    chiefSb.append("咳嗽、咳痰" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "，加重" + sputumAggravateTimeStr.toString() + "。");
-                } else if (!coughTimeStr.toString().equals(sputumTimeStr.toString()) && !coughAggravateTimeStr.toString().equals(sputumAggravateTimeStr.toString())) {
-                    chiefSb.append("咳嗽" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "，咳痰" + sputumTimeStr.toString() + "，加重" + sputumAggravateTimeStr.toString() + "。");
-                }
-            } else if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isNotBlank(coughAggravateTimeStr.toString()) && StringUtil.isBlank(sputumTimeStr.toString())) {
-                chiefSb.append("咳嗽" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "。");
-            } else if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isBlank(coughAggravateTimeStr.toString()) && StringUtil.isBlank(sputumTimeStr.toString())) {
-                chiefSb.append("咳嗽" + coughTimeStr.toString() + "。");
-            }
-            if (StringUtil.isNotBlank(chiefSb.toString())) {
-                map.put("主诉", chiefSb.toString());
+        //存在咳嗽和咳痰
+        if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isNotBlank(sputumTimeStr.toString()) && StringUtil.isNotBlank(coughAggravateTimeStr.toString()) && StringUtil.isNotBlank(sputumAggravateTimeStr.toString())) {
+            if (coughTimeStr.toString().equals(sputumTimeStr.toString()) && coughAggravateTimeStr.toString().equals(sputumAggravateTimeStr.toString())) {
+                chiefSb.append("咳嗽、咳痰" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "。");
+            } else if (coughTimeStr.toString().equals(sputumTimeStr.toString()) && !coughAggravateTimeStr.toString().equals(sputumAggravateTimeStr.toString())) {
+                chiefSb.append("咳嗽、咳痰" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "，加重" + sputumAggravateTimeStr.toString() + "。");
+            } else if (!coughTimeStr.toString().equals(sputumTimeStr.toString()) && !coughAggravateTimeStr.toString().equals(sputumAggravateTimeStr.toString())) {
+                chiefSb.append("咳嗽" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "，咳痰" + sputumTimeStr.toString() + "，加重" + sputumAggravateTimeStr.toString() + "。");
             }
+        } else if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isNotBlank(coughAggravateTimeStr.toString()) && StringUtil.isBlank(sputumTimeStr.toString())) {
+            chiefSb.append("咳嗽" + coughTimeStr.toString() + "，加重" + coughAggravateTimeStr.toString() + "。");
+        } else if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isBlank(coughAggravateTimeStr.toString()) && StringUtil.isBlank(sputumTimeStr.toString())) {
+            chiefSb.append("咳嗽" + coughTimeStr.toString() + "。");
+        }
+        if (StringUtil.isNotBlank(chiefSb.toString())) {
+            map.put("主诉", chiefSb.toString());
+        }
 
-            if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isNotBlank(sputumTimeStr.toString())) {
-                if (coughTimeStr.toString().equals(sputumTimeStr.toString())) {
-                    symptomSb.append(coughTimeStr.toString() + "前" + isNull(moduleDetaillVO.getCoughCause()) + "出现咳嗽、咳痰。咳嗽呈" + isNull(moduleDetaillVO.getCoughNature()) + isNull(moduleDetaillVO.getCoughDegree())
-                            + "伴有" + isNull(moduleDetaillVO.getCoughAccompanyingSymptoms()) + "，咳痰呈" + isNull(moduleDetaillVO.getSputumParoxysm()) + "，" + isNull(moduleDetaillVO.getSputumColour()) + isNull(moduleDetaillVO.getSputumNature())
-                            + "，" + isNull(moduleDetaillVO.getSputumAmount()) + "，每次可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmount()) + "ml，一天总共可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmount()) + "ml，"
-                            + isNull(moduleDetaillVO.getSputumIsUnobstructed()) + "伴有" + isNull(moduleDetaillVO.getSputumAccompanyingSymptoms() + "。")
-                    );
-                } else {
-                    symptomSb.append(coughTimeStr.toString() + "前" + isNull(moduleDetaillVO.getCoughCause()) + "出现咳嗽，咳嗽呈" + isNull(moduleDetaillVO.getCoughNature()) + isNull(moduleDetaillVO.getCoughDegree())
-                            + "伴有" + isNull(moduleDetaillVO.getCoughAccompanyingSymptoms()) + "。" + sputumTimeStr.toString() + "前" + isNull(moduleDetaillVO.getSputumCause()) + "出现咳痰，咳痰呈" + isNull(moduleDetaillVO.getSputumParoxysm()) + "，" + isNull(moduleDetaillVO.getSputumColour()) + isNull(moduleDetaillVO.getSputumNature())
-                            + "，" + isNull(moduleDetaillVO.getSputumAmount()) + isNull(moduleDetaillVO.getSputumParoxysm()) + "，每次可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmount()) + "ml，一天总共可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmount()) + "ml，"
-                            + isNull(moduleDetaillVO.getSputumIsUnobstructed()) + "伴有" + isNull(moduleDetaillVO.getSputumAccompanyingSymptoms() + "。")
-                    );
-                }
-            } else if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isBlank(sputumTimeStr.toString())) {
-                symptomSb.append(coughTimeStr.toString() + "前" + isNull(moduleDetaillVO.getCoughCause()) + "出现咳嗽，咳嗽呈" + isNull(moduleDetaillVO.getCoughNature()) +
-                        isNull(moduleDetaillVO.getCoughDegree()) + "伴有" + isNull(moduleDetaillVO.getCoughAccompanyingSymptoms() + "。")
+        if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isNotBlank(sputumTimeStr.toString())) {
+            if (coughTimeStr.toString().equals(sputumTimeStr.toString())) {
+                symptomSb.append(coughTimeStr.toString() + "前" + isNull(moduleDetaillVO.getCoughCause()) + "出现咳嗽、咳痰。咳嗽呈" + isNull(moduleDetaillVO.getCoughNature()) + isNull(moduleDetaillVO.getCoughDegree())
+                        + "伴有" + isNull(moduleDetaillVO.getCoughAccompanyingSymptoms()) + "，咳痰呈" + isNull(moduleDetaillVO.getSputumParoxysm()) + "，" + isNull(moduleDetaillVO.getSputumColour()) + isNull(moduleDetaillVO.getSputumNature())
+                        + "，" + isNull(moduleDetaillVO.getSputumAmount()) + "，每次可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmount()) + "ml，一天总共可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmountDay()) + "ml，"
+                        + isNull(moduleDetaillVO.getSputumIsUnobstructed()) + "，伴有" + isNull(moduleDetaillVO.getSputumAccompanyingSymptoms() + "。")
+                );
+            } else {
+                symptomSb.append(coughTimeStr.toString() + "前" + isNull(moduleDetaillVO.getCoughCause()) + "出现咳嗽，咳嗽呈" + isNull(moduleDetaillVO.getCoughNature()) + isNull(moduleDetaillVO.getCoughDegree())
+                        + isNull(moduleDetaillVO.getCoughAccompanyingSymptoms()) + "。" + sputumTimeStr.toString() + "前" + isNull(moduleDetaillVO.getSputumCause()) + "出现咳痰，咳痰呈" + isNull(moduleDetaillVO.getSputumParoxysm()) + "，" + isNull(moduleDetaillVO.getSputumColour()) + isNull(moduleDetaillVO.getSputumNature())
+                        + "，" + isNull(moduleDetaillVO.getSputumAmount()) + "，每次可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmount()) + "ml，一天总共可咳约" + isNull(moduleDetaillVO.getSputumSpecificAmountDay()) + "ml，"
+                        + isNull(moduleDetaillVO.getSputumIsUnobstructed()) + "，伴有" + isNull(moduleDetaillVO.getSputumAccompanyingSymptoms() + "。")
                 );
             }
+        } else if (StringUtil.isNotBlank(coughTimeStr.toString()) && StringUtil.isBlank(sputumTimeStr.toString())) {
+            symptomSb.append(coughTimeStr.toString() + "前" + isNull(moduleDetaillVO.getCoughCause()) + "出现咳嗽，咳嗽呈" + isNull(moduleDetaillVO.getCoughNature()) +
+                    isNull(moduleDetaillVO.getCoughDegree()) + isNull(moduleDetaillVO.getCoughAccompanyingSymptoms() + "。")
+            );
+        }
 
-            if (StringUtil.isNotBlank(symptomSb.toString())) {
-                map.put("现病史", symptomSb.toString());
-            }
+        if (moduleDetaillVO.getId() == 2 && StringUtil.isNotBlank(symptomSb.toString())) {
+            map.put("现病史", symptomSb.toString());
         }
+
         return map;
     }
 

src/main/java/com/diagbot/vo/ModuleDetaillVO.java

@@ -29,7 +29,7 @@ public class ModuleDetaillVO {
     //咳嗽加重时间
     private String coughAggravateTime;
     //咳嗽加重时间单位
-    private String coughAggravateTimeUnit;
+    private String coughAggravateUnit;
 //    //咳嗽加重主时间天
 //    private String coughAggravateTimeDay;
 //    //咳嗽加重主时间小时

src/main/java/com/diagbot/vo/ModuleInfoVO.java

@@ -14,5 +14,5 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class ModuleInfoVO {
     @NotNull(message = "请输入模板id")
-    private Long id;
+    private String id;
 }

src/main/resources/mapper/ModuleInfoMapper.xml

@@ -29,6 +29,9 @@
           AND d3.is_deleted = 'N'
           AND d1.id = d2.module_id
           AND d2.id = d3.question_id
+        <if test="moduleInfoVO.id!=null">
+            and d1.mode_id=#{moduleInfoVO.id}
+        </if>
         ORDER BY
             d3.order_no
     </select>