失能回显字段调整

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

@@ -80,14 +80,15 @@
                a.ACPT_SRV_CITY                                                              acptSrvCity,
                a.ACPT_SRV_AREA                                                              acptSrvArea,
                a.ACPT_SRV_STREET                                                            acptSrvStreet,
-               a.ACPT_SRV_ROAD_DETAIL                                                       acptSrvRoadDetail,
+               a.ACPT_SRV_ADDRESS                                                           acptSrvAddress,
                a.ADRESS_DISTRICT_PROVINCIAL                                                 adressDistrictProvincial,
                a.ADRESS_DISTRICT_CITY                                                       adressDistrictCity,
                a.ADRESS_DISTRICT_CODE                                                       adressDistrictCode,
-               a.ADDRESS_ROAD_DETAIL                                                        addressRoadDetail,
-               a.ADDRESS_NUMBER_DETAIL                                                      addressNumberDetail,
+               a.STREET                                                                     street,
+               a.ADRESS_DETAIL                                                              adressDetail,
 
-               a.DISEASE                                                                    disease,
+               a.DISE_TYPE_F                                                                diseTypeF,
+               a.DISE_TYPE_S                                                                diseTypeS,
                a.SRV_MODE_ID                                                                srvModeId,
                a.DISEASE_DESC                                                               diseaseDesc,
                a.MEDICAL_CARD                                                               medicalCard,

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

@@ -45,19 +45,21 @@ public class DisableExamineInfoVO {
     private String acptSrvCity;
     private String acptSrvArea;
     private String acptSrvStreet;
-    private String acptSrvRoadDetail;
+    private String acptSrvAddress;
     //现住址
     private String adressDistrictProvincial;
     private String adressDistrictCity;
     private String adressDistrictCode;
-    private String addressRoadDetail;
-    private String addressNumberDetail;
+    private String street;
+    private String adressDetail;
 
     //***失能人员医疗及失能信息
     //诊断疾病
     private String disease;
+    private Integer diseTypeF;
+    private Integer diseTypeS;
     //申请服务方式
-    private String srvModeId;
+    private Integer srvModeId;
     //病情描述及诊断
     private String diseaseDesc;
     //社会保障卡号
@@ -65,7 +67,7 @@ public class DisableExamineInfoVO {
     //医保类型
     private String medicalType;
     //意向服务机构
-    private String srvOrganId;
+    private Long srvOrganId;
     //意向服务机构执业许可证登记号
     private String permitId;