Merge remote-tracking branch 'origin/master' into dev-20230128

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

@@ -120,6 +120,8 @@
                a.CHECK_REMARK               checkRemark,
                a.REASONS_REVIEW             reasonsReview,
                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

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -159,7 +159,10 @@ public class TaskController {
         List<ChAprReportFraction> chTaskReportFractionDtls = reportDetailVo.getChAprReportFractions();
 
         if (person1 == null) {
-            return Result.failed("鉴定人员1不能为空!");
+            return Result.failed("评估专家不能为空!");
+        }
+        if (person2 == null) {
+            return Result.failed("评估员不能为空!");
         }
         if (taskId == null) {
             return Result.failed("评定任务id不能为空!");

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -167,7 +167,7 @@ public class TaskServiceImpl implements TaskService {
         if (fileDataList != null && fileDataList.size() > 0) {
             updateAttachs(fileDataList, report.getReportId().longValue());
         }
-        //插入评定任务关联人员1.2.3(至少一位,最多三位)
+        //插入评定任务关联人员1.2(两位)
         //person1
         ChAprPersonInfo person1Info = new ChAprPersonInfo();
         person1Info.setReportId(report.getReportId());
@@ -181,13 +181,13 @@ public class TaskServiceImpl implements TaskService {
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
         }
-        if (person3 != null) {
+        /*if (person3 != null) {
             ChAprPersonInfo personInfo = new ChAprPersonInfo();
             personInfo.setReportId(report.getReportId());
             personInfo.setEmpId(person1);
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
-        }
+        }*/
         if(!chAprReportFractions.isEmpty() && chAprReportFractions.size()>0){
             for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
                 chAprReportFraction.setReportId(report.getReportId());

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprReport.java

@@ -14,6 +14,7 @@ public class ChAprReport {
     private Integer reportId;
     private Integer checkName;
     private Integer evaluateRatingType;
+    private Integer evaluateType;
     private Integer status;
     private java.util.Date endTime;
     private String polNo;

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/assessment/TaskReportVO.java

@@ -70,6 +70,8 @@ public class TaskReportVO {
     private String acptSrvAddress;
     //评定结果
     private String riskLevel;
+    //评估类型
+    private Integer evaluateType;
 
     private Map<String,Object> chAprReportFractions;
 

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());

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml

@@ -92,6 +92,8 @@
         disable.ACPT_SRV_ADDRESS acptSrvAddress,
         --评定等级
         report.evaluate_rating_type evaluateRatingType,
+        --评定类型
+        report.EVALUATE_TYPE evaluateType,
         --评定完成日期
         aprtask.finish_time finishTime,
         --服务方式