Merge branch 'dev_20230205_mq'

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

@@ -119,7 +119,10 @@
                a.APPLY_STATUS               applyStatus,
                a.CHECK_REMARK               checkRemark,
                a.REASONS_REVIEW             reasonsReview,
-               a.REASONS_REMARK             reasonsRemark
+               a.REASONS_REMARK             reasonsRemark,
+               a.MEDICAL_PROVINCIAL       medicalProvincial,
+               a.MEDICAL_CITY               medicalCity,
+               a.MEDICAL_AREA               medicalArea
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         where a.APPLY_ID = #{applyId}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java

@@ -602,8 +602,23 @@ public class ChDisableApply extends PageInfo implements Serializable {
      */
     private String bankCardNo;
 
+//    /**
+//     *医保统筹区
+//     */
+//    private String medicalArea;
+
+    /**
+     *医保统筹区省
+     */
+    private String medicalProvincial;
+
+    /**
+     *医保统筹区市
+     */
+    private String medicalCity;
+
     /**
-     *医保统筹区
+     *医保统筹区区
      */
     private String medicalArea;
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChAprOrgan.java

@@ -191,10 +191,15 @@ public class ChAprOrgan implements Serializable {
      */
     private String linkMail;
 
+//    /**
+//     * 评定起点地址id
+//     */
+//    private Long groupDetailId;
+
     /**
-     * 评定起点地址id
+     * 评定起点地址名称
      */
-    private Long groupDetailId;
+    private String groupDetailName;
 
     /**
      * 接受鉴定地址经度

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

@@ -31,6 +31,20 @@ public class DisableExamineInfoVO {
     private String gender;
     //手机
     private String tel;
+    /**
+     *医保统筹区省
+     */
+    private String medicalProvincial;
+
+    /**
+     *医保统筹区市
+     */
+    private String medicalCity;
+
+    /**
+     *医保统筹区区
+     */
+    private String medicalArea;
     //所在户籍
     private String regist;
     //固话

governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java

@@ -135,7 +135,7 @@ public class AprOrganController {
             if (StringUtils.isBlank(chAprOrgan.getLinkTel())) {//机构联系人手机号
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
-            if (chAprOrgan.getGroupDetailId() == null) {//评定起点地址
+            if (chAprOrgan.getGroupDetailName() == null) {//评定起点地址
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
             if (StringUtils.isBlank(chAprOrgan.getAccName())) {//银行账户名称
@@ -188,7 +188,7 @@ public class AprOrganController {
             if (StringUtils.isBlank(chAprOrgan.getLinkTel())) {//机构联系人手机号
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
-            if (chAprOrgan.getGroupDetailId() == null) {//评定起点地址
+            if (chAprOrgan.getGroupDetailName() == null) {//评定起点地址
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
         }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java

@@ -102,7 +102,7 @@ public class AprOrganServiceImpl extends ServiceImpl<AprOrganMapper, ChAprOrgan>
             aprOrgan.setAcptStreet(chAprOrgan.getAcptStreet());
             aprOrgan.setLinkName(chAprOrgan.getLinkName());
             aprOrgan.setLinkTel(chAprOrgan.getLinkTel());
-            aprOrgan.setGroupDetailId(chAprOrgan.getGroupDetailId());
+            aprOrgan.setGroupDetailName(chAprOrgan.getGroupDetailName());
             aprOrgan.setLinkMail(chAprOrgan.getLinkMail());
             aprOrganMapper.updateById(aprOrgan);
             chAprOrgan.setAprOrganId(aprOrgan.getAprOrganId());