Merge branch 'master' of gitee.com:shanghai_heng_ge_information/long-term-care

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -17,13 +17,14 @@
         a.gender gender,
         a.OPER_CERTI_CODE operCertiCode,
         a.fixed_tel fixedTel,
-        a.srv_mode_id srvModeId,
+        m.SRV_MODE_NAME srvModeName,
         a.disease disease,
         a.eff_time effTime,
         a.data_from dataFrom,
-        a.ADRESS_DETAIL adressDetail
-        from CH_DISABLE_APPLY a,CH_FND_ORGAN o
+        a.APPLY_STATUS applyStatus
+        from CH_DISABLE_APPLY a,CH_FND_ORGAN o,CH_FND_SRV_MODE m
         where a.organ_id = o.ORGAN_ID
+        and a.srv_mode_id = m.SRV_MODE_ID
         <if test="organId != null and organId != ''">
             <if test="isIncludeSubsidiaries == '0'">
                 and a.organ_id in (select organ_id form CH_FND_ORGAN where PARENT_ID = #{organId})

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java

@@ -38,7 +38,7 @@ public class DisableVO {
     //失能人员联系方式
     private String fixedTel;
     //申请服务方式
-    private String srvModeId;
+    private String srvModeName;
     //诊断疾病
     private String disease;
     //申请时间
@@ -46,5 +46,5 @@ public class DisableVO {
     //申请来源
     private String dataFrom;
     //审核状态
-    private String adressDetail;
+    private String applyStatus;
 }