失能评定分配代码修改及增加所属片区代码修改

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -11,6 +11,7 @@
         d.ACCOUNTS_OVERALL_COST accountsOverallCost,
         d.ACCOUNTS_PERSONAL_COST accountsPersonalCost,
         d.TASK_DETAIL_ID taskDetailId,
+        ar.beloing_area beloingArea,
         (select district_name from ch_fnd_district dis where apply.MEDICAL_AREA = dis.district_code)  medicalArea,
         o.SRV_ORGAN_NAME  srvOrganName,
         o.SRV_ORGAN_ID srvOrganId,
@@ -27,6 +28,7 @@
         left join  CH_DISABLE_INFO info on d.DISAB_INFO_ID = info.DISAB_INFO_ID
         left join  CH_DISABLE_APPLY apply on info.APPLY_ID=apply.APPLY_ID
         left join CH_SRV_ORGAN  o on d.SRV_ORGAN_ID = o.SRV_ORGAN_ID
+        left join ch_fnd_district_beloing_area ar on apply.MEDICAL_AREA=ar.district_code
         <where>
             1=1
             <if test="req.flag != null and  req.flag != ''">
@@ -62,6 +64,10 @@
                 </foreach>
             </if>
 
+            <if test="req.beloingArea != null and req.beloingArea != ''">
+                AND ar.beloing_area = #{req.beloingArea}
+            </if>
+
         </where>
         order by info.DISAB_INFO_ID
     </select>
@@ -87,11 +93,13 @@
         d.REISSUE_AMOUNT reissueAmount,
         d.ACCOUNTS_DETAIL_ID accountsDetailId,
         DECODE(d.STATUS, '0','未申报','1', '已申报','2','已暂缓') status,
-        d.ACCOUNTS_ID accountsId
+        d.ACCOUNTS_ID accountsId,
+        ar.beloing_area beloingArea
         from  CH_DISAB_ACCOUNTS_DETAIL  d
         left join  CH_DISABLE_INFO info on d.DISAB_INFO_ID = info.DISAB_INFO_ID
         left join  CH_DISABLE_APPLY apply on info.APPLY_ID=apply.APPLY_ID
         left join CH_SRV_ORGAN  o on d.SRV_ORGAN_ID = o.SRV_ORGAN_ID
+        left join ch_fnd_district_beloing_area ar on apply.MEDICAL_AREA=ar.district_code
         <where>
               d.mode_name <![CDATA[ <>]]> '异地'
 
@@ -117,7 +125,9 @@
                     #{accountsStatusList}
                 </foreach>
             </if>
-
+            <if test="beloingArea != null and beloingArea != ''">
+                AND ar.beloing_area = #{beloingArea}
+            </if>
         </where>
         order by info.DISAB_INFO_ID
     </select>

account/account-service/src/main/resources/mapper/ChDisabAccountsMapper.xml

@@ -53,11 +53,22 @@
         t1.TOTAL_ALLOCATED_EXPENSES   totalAllocatedExpenses,
         t1.REISSUE_AMOUNT_TOTAL reissueAmountTotal,
         t1.DEDUCTION_AMOUNT_TOTAL deductionAmountTotal,
-        (select count(1) from  CH_DISAB_ACCOUNTS_DETAIL d where d.ACCOUNTS_ID =t1.ACCOUNTS_ID and d.STATUS = 1) personDay
+        (select count(1) from  CH_DISAB_ACCOUNTS_DETAIL d where d.ACCOUNTS_ID =t1.ACCOUNTS_ID and d.STATUS = 1) personDay,
+        resu.beloingArea
         FROM
         CH_DISAB_ACCOUNTS t1
         LEFT JOIN CH_SRV_ORGAN t2 ON t1.SRV_ORGAN_ID = t2.SRV_ORGAN_ID
         LEFT JOIN CH_FND_ORGAN t3 ON t2.ORGAN_ID = t3.ORGAN_ID
+        LEFT JOIN
+        (
+        select f.accounts_id,max(ar.beloing_area) beloingArea from CH_DISAB_ACCOUNTS_detail f,ch_disable_info fe,CH_DISABLE_APPLY ly,
+        ch_fnd_district_beloing_area ar
+        where f.disab_info_id = fe.disab_info_id
+        and fe.APPLY_ID=ly.apply_id
+        and ly.MEDICAL_AREA=ar.district_code
+        group by f.accounts_id
+        ) resu
+        on t1.accounts_id=resu.accounts_id
         <where>
             t1.ACCOUNTS_STATUS !=0
             <if test='organIds != null and organIds.size()>0'>
@@ -81,6 +92,10 @@
                     #{accountsStatusList}
                 </foreach>
             </if>
+            <if test="req.beloingArea != null and  req.beloingArea != ''">
+                and resu.beloingArea = #{req.beloingArea}
+            </if>
+
         </where>
     </select>
 

account/account-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -54,12 +54,21 @@
         organ.SRV_ORGAN_NAME srvOrganName,
         DECODE(plan.MODE_ID, '1','医疗','2', '养老','3','上门', '4', '异地') srvModeName,
         to_char(plan.SRV_PLAN_TIME,'yyyy-MM-dd') srvDate,
-        detail.check_status status
+        detail.check_status status,
+        resu.beloingArea
         from ch_srv_plan plan
         left join ch_disable_info info on plan.DISAB_INFO_ID = info.DISAB_INFO_ID
         left join ch_srv_organ_emp emp on plan.emp_id = emp.emp_id
         left join CH_SRV_TASK_DETAIL detail on detail.TASK_DETAIL_ID = plan.TASK_DETAIL_ID
         left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
+        left join (
+        select fe.disab_info_id,max(ar.beloing_area) beloingArea from ch_disable_info fe,CH_DISABLE_APPLY ly,
+        ch_fnd_district_beloing_area ar
+        where fe.APPLY_ID=ly.apply_id
+        and ly.MEDICAL_AREA=ar.district_code
+        group by fe.disab_info_id
+        ) resu
+        on resu.disab_info_id=info.DISAB_INFO_ID
     <where>
         1=1  and   detail.check_status in (1,2,3)
         <if test="req.status != null  and req.status != ''">
@@ -77,7 +86,9 @@
         <if test="req.srvOrganId != null and req.srvOrganId != '' and req.srvOrganId!=0">
             AND organ.SRV_ORGAN_ID = #{req.srvOrganId}
         </if>
-
+        <if test="req.beloingArea != null and  req.beloingArea != ''">
+            and resu.beloingArea = #{req.beloingArea}
+        </if>
     </where>
         order by status,taskDetailId
 </select>

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

@@ -264,14 +264,20 @@ public class TaskController {
      * 评定任务分配
      *
      * @param taskId 评定任务id,如果多条以逗号(,)分隔
-     * @param empId  评定人员id
+     * @param  empId empId2  person2 评定人员id
      */
     @RequestMapping("/allotTask")
-    public Result allotTask(String taskId, String empId) {
-        if (StringUtils.isBlank(taskId) && StringUtils.isBlank(empId)) {
+    public Result allotTask(String taskId, String empId, String empId2, Integer evaluateType) {
+        if (StringUtils.isBlank(taskId)) {
             return Result.failed("id不能为空!");
         }
-        Result<Object> objectResult = taskService.allotTask(taskId, empId);
+        if (evaluateType == null) {
+            return Result.failed("评估类型不能为空");
+        }
+        if (StringUtils.isBlank(empId) || StringUtils.isBlank(empId2)) {
+            return Result.failed("评估人员不能为空");
+        }
+        Result<Object> objectResult = taskService.allotTask(taskId, empId,empId2,evaluateType);
         if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
             return Result.failed(objectResult.getMsg());

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -41,7 +41,7 @@ public interface TaskService {
 
     TaskReportVO getReportById(String reportId);
 
-    Result<Object> allotTask(String taskId, String empId);
+    Result<Object> allotTask(String taskId, String empId, String empId2, Integer evaluateType);
 
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
 

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

@@ -484,12 +484,25 @@ public class TaskServiceImpl implements TaskService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Result<Object> allotTask(String taskId, String empId) {
+    public Result<Object> allotTask(String taskId, String empId, String empId2, Integer evaluateType) {
         ChAprEmp chAprEmp = aprEmpMapper.selectById(empId);
-        if (chAprEmp == null || chAprEmp.getGroupLeader() == null || chAprEmp.getGroupLeader() != 0) {
-            //不是组长
-            return Result.failed("评定人员必须是组长!");
+        ChAprEmp chAprEmp2 = aprEmpMapper.selectById(empId2);
+        if(evaluateType==1){//如果是争议复评，则必须都是组长
+            if (chAprEmp == null || chAprEmp.getGroupLeader() == null || chAprEmp.getGroupLeader() != 0) {
+                //不是组长
+                return Result.failed("评定人员必须是组长!");
+            }
+            if (chAprEmp2 == null || chAprEmp2.getGroupLeader() == null || chAprEmp2.getGroupLeader() != 0) {
+                //不是组长
+                return Result.failed("评定人员必须是组长!");
+            }
+        }else{
+            if (chAprEmp == null || chAprEmp.getGroupLeader() == null || chAprEmp.getGroupLeader() != 0) {
+                //不是组长
+                return Result.failed("评定人员必须是组长!");
+            }
         }
+
         String[] taskIds = taskId.split(",");
         //任务分配日期
         Date assignTime = new Date();
@@ -507,6 +520,7 @@ public class TaskServiceImpl implements TaskService {
             task.setAprEmpId(Integer.parseInt(empId));//评定人员id
             task.setAssignTime(assignTime);
             task.setTaskStatus(1);
+            task.setEvaluateType(evaluateType);//评估类型
             taskMapper.updateById(task);
             //更新失能人员信息
             ChDisableInfo chDisableInfo = disableInfoMapper.selectById(task.getDisableInfoId());
@@ -521,23 +535,30 @@ public class TaskServiceImpl implements TaskService {
             report.setEffTime(new Date());
             report.setFcd(new Date());
             report.setStatus(0);
+            report.setEvaluateType(evaluateType);//评估类型
             aprReportMapper.insert(report);
 
-            ChAprPersonInfo person1Info = new ChAprPersonInfo();
-            person1Info.setReportId(report.getReportId());
-            if(StringUtils.isNotEmpty(empId)) {
+            if(StringUtils.isNotBlank(empId)) {
+                ChAprPersonInfo person1Info = new ChAprPersonInfo();
+                person1Info.setReportId(report.getReportId());
                 person1Info.setEmpId(Integer.parseInt(empId));
+                person1Info.setFcd(new Date());
+                personInfoMapper.insert(person1Info);
             }
-            person1Info.setFcd(new Date());
-            personInfoMapper.insert(person1Info);
-
-
-            //生成组
+            if(StringUtils.isNotBlank(empId2)) {
+                ChAprPersonInfo person2Info = new ChAprPersonInfo();
+                person2Info.setReportId(report.getReportId());
+                person2Info.setEmpId(Integer.parseInt(empId2));
+                person2Info.setFcd(new Date());
+                personInfoMapper.insert(person2Info);
+            }
+            //第一个评定专家生成组
             ChAprTaskPush taskPush = new ChAprTaskPush();
             taskPush.setAssignTime(new Date());
             taskPush.setGroupNumber(SerialNumberUtils.getSerialNumber(empId));
             taskPush.setTaskId(Long.parseLong(id));
             taskPush.setEmpId(Long.parseLong(empId));
+            taskPush.setEmpId2(Long.parseLong(empId2));
             taskPush.setStatus((short) 1);
             taskPush.setIsManual((short) 1);
             //生成分组历史
@@ -546,6 +567,7 @@ public class TaskServiceImpl implements TaskService {
             //插入分组数据
             taskPushMapper.insert(taskPush);
             taskPushHisMapper.insert(pushHis);
+
         }
         return Result.success();
     }

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

@@ -413,12 +413,15 @@
                push.Refuse_time      refuseTime,
                push.status           status,
                push.Refuse_reason    refuseReason,
-               push.Refuse_remark    refuseRemark
+               push.Refuse_remark    refuseRemark,
+               task.evaluate_type evaluateType,
+               emp2.real_name realName2
         FROM ch_apr_task_push_his push
                  LEFT JOIN ch_apr_task task ON push.TASK_ID = task.TASK_ID
                  left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
                  LEFT JOIN ch_apr_emp emp on push.emp_id = emp.emp_id
                  left join ch_apr_organ organ on emp.apr_organ_id = organ.apr_organ_id
+                 LEFT JOIN ch_apr_emp emp2 on push.emp_id2 = emp2.emp_id
         WHERE disable.disab_info_id= #{disabId}
     </select>
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccountsResp.java

@@ -83,4 +83,7 @@ public class ChDisabDetailAccountsResp implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
+
+    //增加所属片区字段
+    private String beloingArea;
 }
\ No newline at end of file

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

@@ -41,4 +41,5 @@ public class ChAprTask {
     private Integer lcu;
     private java.util.Date lastAprDate;
     private String appointmentRemark;
+    private Integer evaluateType;
 }

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

@@ -243,4 +243,9 @@ public class ChAprTaskPush implements Serializable {
      * 预约备注
      */
     private String appointmentRemark;
+
+    /**
+     * 评定人员ID
+     */
+    private Long empId2;
 }
\ No newline at end of file

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

@@ -245,4 +245,9 @@ public class ChAprTaskPushHis implements Serializable {
     private String appointmentRemark;
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 评定人员ID
+     */
+    private Long empId2;
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/AccountDeclareExportResp.java

@@ -13,6 +13,8 @@ import lombok.Data;
 @Data
 public class AccountDeclareExportResp {
 
+    @Excel(name = "所属片区",width = 20)
+    private String beloingArea;
 
     @Excel(name = "统筹区",width = 20)
     private String medicalArea;

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganAccountListResp.java

@@ -113,5 +113,7 @@ public class SrvOrganAccountListResp {
      */
     private List<String> reissueReason;
 
+    //所属片区
+    private String beloingArea;
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListReq.java

@@ -52,4 +52,7 @@ public class SrvOrganListReq extends BaseReq {
     // 检索条件
     private String status;
 
+    //所属片区
+    private String beloingArea;
+
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvTaskReqVO.java

@@ -24,4 +24,8 @@ public class SrvTaskReqVO extends BaseReq {
     private Long srvOrganId;
 
     private Integer userId;
+
+    //所属片区
+    private String beloingArea;
+
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvTaskRespVO.java

@@ -59,5 +59,8 @@ public class SrvTaskRespVO {
 
     private boolean auditFlag;
 
+    //所属片区
+    private String beloingArea;
+
 
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AllotTaskHisVO.java

@@ -41,4 +41,9 @@ public class AllotTaskHisVO {
     private String refuseReason;
     //备注
     private String refuseRemark;
+    //评定人员
+    private String realName2;
+    //评估类型
+    private String evaluateType;
+
 }

common/common-core/src/main/java/com/hungraim/ltc/util/CsoftSecurityUtil.java

@@ -325,6 +325,7 @@ public class CsoftSecurityUtil {
             log.info("公钥:{}",publicKeyString);
             log.info("私钥:{}",privateKeyString);
             redisCache.setCacheObject(publicKeyString,privateKeyString,1, TimeUnit.DAYS);
+            redisCache.getCacheObject(publicKeyString);
             keyMap.put(0, publicKeyString);  //0表示公钥
             keyMap.put(1, privateKeyString);  //1表示私钥
         }catch (NoSuchAlgorithmException e){

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

@@ -23,7 +23,7 @@ import java.net.URLEncoder;
 import java.util.List;
 
 /**
- * 监管机构及监管机构人员信息管理Controller
+ * 3Controller
  *
  * @author czz
  */