Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@@ -4368,7 +4368,7 @@ public class FollowUpService {
            "  f.coughing,\n" +
            "  dict_coughing.dict_value coughingValue,\n" +
            "  f.dysphagia,\n" +
            "  CASE f.dysphagia WHEN '1' THEN '有' WHEN '0' THEN '无' ELSE f.dysphagia END AS dysphagiaValue,\n" +
            "  dict_dysphagia.dict_value dysphagiaValue,\n" +
            "  f.rash,\n" +
            "  CASE f.rash WHEN '1' THEN '有' WHEN '0' THEN '无' ELSE f.rash END AS rashValue,\n" +
            "  f.rash_grade rashGrade,\n" +
@@ -4450,6 +4450,7 @@ public class FollowUpService {
            "LEFT JOIN wlyy_hospital_sys_dict dict_family_support ON dict_family_support.dict_name='family_support' AND dict_family_support.dict_code=f.family_support\n" +
            "LEFT JOIN wlyy_hospital_sys_dict dict_symptom_record ON dict_symptom_record.dict_name='symptom_record' AND dict_symptom_record.dict_code=f.symptom_record\n" +
            "LEFT JOIN wlyy_hospital_sys_dict dict_medication_compliance ON dict_medication_compliance.dict_name='medication_compliance' AND dict_medication_compliance.dict_code=f.medication_compliance\n" +
            "LEFT JOIN wlyy_hospital_sys_dict dict_dysphagia ON dict_dysphagia.dict_name='dysphagia' AND dict_dysphagia.dict_code=f.dysphagia\n" +
            "LEFT JOIN wlyy_hospital_sys_dict dict_lifestyle ON dict_lifestyle.dict_name='lifestyle' AND dict_lifestyle.dict_code=f.lifestyle\n" +
            "LEFT JOIN wlyy_hospital_sys_dict d2 ON d2.dict_name='FOLLOWUP_WAY_DICT' AND d2.dict_code=f.next_followup_way ";