修改修改

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

@@ -4,23 +4,25 @@
 
     <select id="getListDisableInfoChange" resultType="com.hungraim.ltc.pojo.vo.disable.DisableInfoChangeVo">
         select
-            (select ORGAN_NAME from CH_FND_ORGAN organ where change.ORGAN_ID=organ.ORGAN_ID )organName,
-            change.ORGAN_ID organId,
-            change.DISTRICT_PROVINCE districtProvince,
-            change.DISTRICT_CITY districtCity,
-            change.DISTRICT_AREA districtArea,
-            (select ORGAN_NAME from CH_FND_ORGAN organ where change.APL_ORGAN_ID=organ.ORGAN_ID)aplOrganName,
-            change.REAL_NAME realName,
-            change.GENDER gender,
-            change.BIRTHDAY birthday,
-            change.CERTIF_NUM certifNum,
-            change.TEL tel,
-            (select SRV_MODE_NAME from CH_FND_SRV_MODE cfdt where disinfo.SRV_MODE_ID=cfdt.SRV_MODE_ID)srvModeName,
-            (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disinfo.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
-            change.EFF_TIME effTime,
-            change.APPLY_STATUS applyStatus
+        change.CHANGE_ID changeId,
+        organ.ORGAN_NAME organName,
+        change.ORGAN_ID organId,
+        change.DISTRICT_PROVINCE districtProvince,
+        change.DISTRICT_CITY districtCity,
+        change.DISTRICT_AREA districtArea,
+        (select ORGAN_NAME from CH_FND_ORGAN organ where change.APL_ORGAN_ID=organ.ORGAN_ID)aplOrganName,
+        change.REAL_NAME realName,
+        change.GENDER gender,
+        change.BIRTHDAY birthday,
+        change.CERTIF_NUM certifNum,
+        change.TEL tel,
+        (select SRV_MODE_NAME from CH_FND_SRV_MODE cfdt where disinfo.SRV_MODE_ID=cfdt.SRV_MODE_ID)srvModeName,
+        (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disinfo.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
+        change.EFF_TIME effTime,
+        change.APPLY_STATUS applyStatus
         from CH_DISABLE_INFO_CHANGE change
-                 left join CH_DISABLE_INFO disinfo on change.DISAB_INFO_ID=disinfo.DISAB_INFO_ID
+        left join CH_DISABLE_INFO disinfo on change.DISAB_INFO_ID=disinfo.DISAB_INFO_ID
+        left join CH_FND_ORGAN organ on change.ORGAN_ID=organ.ORGAN_ID
         <where>
             and task.APR_TYPE = 0
             <if test="organId != null">

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

@@ -7,39 +7,42 @@
         apply.APPLY_ID applyId,
         apply.ORGAN_ID organId,
         fndOrgan.ORGAN_NAME organName,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_PROVINCIAL= dis.DISTRICT_CODE) districtProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_CITY = dis.DISTRICT_CODE) districtCity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_AREA = dis.DISTRICT_CODE) districtArea,
-        (select STREET_NAME from CH_FND_STREET dis where apply.ACPT_STREET=dis.STREET_CODE)acptStreet,
+        apply.ACPT_PROVINCIAL districtProvincial,
+        apply.ACPT_CITY districtCity,
+        apply.ACPT_AREA districtArea,
+        apply.ACPT_STREET acptStreet,
         apply.REAL_NAME realName,apply.CERTI_CODE certiCode,apply.BIRTHDAY birthday,apply.GENDER gender,apply.TEL tel,
         apply.FIXED_TEL fixedTel,apply.REGIST regist,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_SRV_PROVINCIAL= dis.DISTRICT_CODE) acptSrvProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_SRV_CITY = dis.DISTRICT_CODE) acptSrvCity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_SRV_AREA = dis.DISTRICT_CODE) acptSrvArea,
-        (select STREET_NAME from CH_FND_STREET dis where apply.ACPT_SRV_STREET=dis.STREET_CODE)acptSrvStreet,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ADRESS_DISTRICT_PROVINCIAL= dis.DISTRICT_CODE) adressDistrictProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ADRESS_DISTRICT_CITY = dis.DISTRICT_CODE) adressDistrictCity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ADRESS_DISTRICT_CODE = dis.DISTRICT_CODE) adressDistrictCode,
-        (select STREET_NAME from CH_FND_STREET dis where apply.ADDRESS_ROAD_DETAIL=dis.STREET_CODE)addressRoadDetail,
-
-        (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE cfdt where apply.DISE_TYPE_F = cfdt.DISE_TYPE_ID) diseTypeF,
-        (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE cfdt where apply.DISE_TYPE_S = cfdt.DISE_TYPE_ID) diseTypeS,
-        (select SRV_MODE_NAME from CH_FND_SRV_MODE cfdt where apply.SRV_MODE_ID=cfdt.SRV_MODE_ID)srvModeName,
+        apply.ACPT_SRV_PROVINCIAL acptSrvProvincial,
+        apply.ACPT_SRV_CITY acptSrvCity,
+        apply.ACPT_SRV_AREA acptSrvArea,
+        apply.ACPT_SRV_STREET acptSrvStreet,
+        apply.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial,
+        apply.ADRESS_DISTRICT_CITY adressDistrictCity,
+        apply.ADRESS_DISTRICT_CODE adressDistrictCode,
+        apply.ADDRESS_ROAD_DETAIL addressRoadDetail,
+        apply.DISE_TYPE_F diseTypeF,
+        apply.DISE_TYPE_S diseTypeS,
+        srvMode.SRV_MODE_NAME srvModeName,
         apply.DISEASE_DESC diseaseDesc,
-        (select MDC_NAME from CH_FND_MEDICAL_TYPE where apply.MEDICAL_TYPE=MDC_TYPE)mdcName,
-        (select SRV_ORGAN_NAME from CH_SRV_ORGAN where apply.SRV_ORGAN_ID=CH_SRV_ORGAN.SRV_ORGAN_ID)srvOrganName,
+        medicalType.MDC_NAME mdcName,
+        srvOrgan.SRV_ORGAN_NAME srvOrganName,
         apply.OPER_NAME operName,apply.OPER_CERTI_CODE operCertiCode,apply.OPER_TEL operTel,apply.OPER_RELATION operRelation,
         apply.OPER_FIXED_TEL operFixedTel,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.OPER_DISTRICT_PROVINCE= dis.DISTRICT_CODE) operDistrictProvince,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.OPER_DISTRICT_CITY = dis.DISTRICT_CODE) operDistrictCity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.OPER_DISTRICT_CODE = dis.DISTRICT_CODE) operDistrictCode,
-        (select STREET_NAME from CH_FND_STREET dis where apply.OPER_ROAD_DETAIL=dis.STREET_CODE)operRoadDetail,
+        apply.OPER_DISTRICT_PROVINCE operDistrictProvince,
+        apply.OPER_DISTRICT_CITY operDistrictCity,
+        apply.OPER_DISTRICT_CODE operDistrictCode,
+        apply.OPER_ROAD_DETAIL operRoadDetail,
         apply.REASONS_REVIEW reasonsReview,
         apply.APPLY_STATUS applyStatus,
-        (select APL_STATUS_NAME from CH_FND_APPLY_STATUS_TYPE where apply.APPLY_STATUS=APL_STATUS_TYPE)applyStatusName,
+        applyStatusType.APL_STATUS_NAME applyStatusName,
         apply.REASONS_REMARK reasonsRemark
         from CH_DISABLE_APPLY apply
         left join CH_FND_ORGAN fndOrgan on apply.ORGAN_ID=fndOrgan.ORGAN_ID
+        left join CH_FND_SRV_MODE srvMode on apply.SRV_MODE_ID=srvMode.SRV_MODE_ID
+        left join CH_FND_MEDICAL_TYPE medicalType on apply.MEDICAL_TYPE=medicalType.MDC_TYPE
+        left join SRV_ORGAN_NAME srvOrgan on apply.SRV_ORGAN_ID=srvOrgan.SRV_ORGAN_ID
+        left join CH_FND_APPLY_STATUS_TYPE applyStatusType on apply.APPLY_STATUS=applyStatusType.APL_STATUS_TYPE
         where apply.APPLY_ID = #{applyId}
     </select>
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChDisableApplyVo.java

 package com.hungraim.ltc.pojo.vo.disable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -47,7 +48,7 @@ public class ChDisableApplyVo {
     /**
      * 出生年月
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date birthday;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableInfoChangeDetailVo.java

 package com.hungraim.ltc.pojo.vo.disable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class DisableInfoChangeDetailVo {
     /**
@@ -39,7 +42,8 @@ public class DisableInfoChangeDetailVo {
     /**
      * 出生年月
      */
-    private String birthday;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
     /**
      * 性别
      */
@@ -113,7 +117,7 @@ public class DisableInfoChangeDetailVo {
     /**
      * 审核结果
      */
-    private short applyStatus;
+    private Short applyStatus;
     /**
      * 备注
      */

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableInfoChangeVo.java

 package com.hungraim.ltc.pojo.vo.disable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -47,6 +48,7 @@ public class DisableInfoChangeVo {
     /**
      * 出生年月
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date birthday;
 
     /**
@@ -69,6 +71,7 @@ public class DisableInfoChangeVo {
     /**
      * 申请提交时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date effTime;
     /**
      * 审核状态