服务机构分配

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -77,5 +77,5 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
 
     List<AprEmpExportVO> aprEmpExportList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
 
-    int insertSrvSend(Integer disableInfoId,Integer taskId);
+    int insertSrvSend(Integer disableInfoId);
 }

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

@@ -221,7 +221,7 @@ public class TaskServiceImpl implements TaskService {
         if(2 == reportDetailVO.getEvaluateType()){
             ChAprTask chAprTask = taskMapper.selectById(reportDetailVO.getTaskId());
             Integer disableInfoId = chAprTask.getDisableInfoId();
-            taskMapper.insertSrvSend(disableInfoId,reportDetailVO.getTaskId());
+            taskMapper.insertSrvSend(disableInfoId);
         }
         return Result.success();
     }

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

@@ -526,8 +526,8 @@
     </select>
 
     <insert id="insertSrvSend">
-        insert INTO ch_srv_send(SRV_SEND_ID,DISAB_INFO_ID,FCD,STATUS,TASK_ID) values
-        ((SELECT max(srv_send_id)+1 id from CH_SRV_SEND),#{disableInfoId},SYSDATE,0,#{taskId})
+        insert INTO ch_srv_send(SRV_SEND_ID,DISAB_INFO_ID,FCD,STATUS) values
+        ((SELECT max(srv_send_id)+1 id from CH_SRV_SEND),#{disableInfoId},SYSDATE,0)
     </insert>
 
 

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

@@ -254,8 +254,9 @@ public class BuildBedController {
                         id = 0L;
                     }
                     chSrvSend.setSrvSendId(++id);
+                }else {
+                    chSrvSend.setSrvSendId(chrSrvVo.getSrvSendId());
                 }
-                chSrvSend.setSrvSendId(chrSrvVo.getSrvSendId());
                 sendService.saveOrUpdate(chSrvSend);
             }
         } else {

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

@@ -21,7 +21,7 @@ public class SrvTaskScheduledController {
     @Autowired
     private SrvTaskService srvTaskService;
 
-    @Scheduled(cron = "0 45 14 * * ?")
+    @Scheduled(cron = "0 50 20 * * ?")
     public void timeAllocationSrvTask() {
         log.info("timeAllocationSrvTask========start");
         srvTaskService.timeAllocationSrvTask();

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

@@ -21,9 +21,8 @@
 
   <!--查询服务分配信息列表-->
   <select id="selectSendList" resultMap="sendresultMap">
-
     SELECT
-    s.srv_send_id,
+      distinct  s.srv_send_id,
     i.disab_info_id,
     o.organ_id,
     o.ORGAN_NAME,