异地登记

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

@@ -78,7 +78,9 @@
   to_char(detail.SRV_DATE,'yyyy-MM-dd') srvPlanTime,
   '上门' modeName,
   to_char(item.FCD,'yyyy-MM-dd HH24:mi:ss') executionTime,
-  service.SERVICE_TYPE_DETAILED_NAME itemName
+  service.SERVICE_TYPE_DETAILED_NAME itemName,
+  to_char(detail.SRV_START_TIME,'yyyy-MM-dd HH24:mi:ss') srvStartTime,
+  to_char(detail.SRV_END_TIME,'yyyy-MM-dd HH24:mi:ss') srvEndTime
 from CH_SRV_TASK_FINISH_ITEM item
   left join CH_SRV_TASK_DETAIL detail on detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
   left join CH_SRV_TASK task on task.SRV_TASK_ID = detail.SRV_TASK_ID

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

@@ -33,5 +33,9 @@ public class NursingRecordsRespVO {
      **/
     private String itemName;
 
+    private String srvStartTime;
+
+    private String srvEndTime;
+
 
 }

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

@@ -15,4 +15,5 @@ public class PlaceOtherVO {
     private String certiCode;
     private String riskLevel;
     private String diseTypeS;
+    private String otherApplyTime;
 }

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

@@ -359,9 +359,9 @@ public class BuildBedController {
     }
 
     @RequestMapping("/placeOtherQuery")
-    public Result<Page<PlaceOtherVO>> placeOtherQuery(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, String name, String certiCode) {
+    public Result<Page<PlaceOtherVO>> placeOtherQuery(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, String realName, String certiCode) {
         Page<PlaceOtherVO> page = new Page<>(pageNum, pageSize);
-        page = buildBedService.placeOtherQuery(page,name, certiCode);
+        page = buildBedService.placeOtherQuery(page,realName, certiCode);
         return Result.success(page);
     }
 
@@ -369,7 +369,7 @@ public class BuildBedController {
     public Result placeOtherApply(Integer disabInfoId, String otherApplyTime) {
 
         int  result = buildBedService.placeOtherApply(disabInfoId, otherApplyTime);
-        if (result > 1) {
+        if (result > 0) {
             return Result.success();
         }else {
             return Result.failed("申请失败");

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

@@ -173,7 +173,8 @@
        lev.DISABLE_LEVEL_NAME riskLevel,
        report.PUBLICITY_START_TIME publicityStartTime,
        report.PUBLICITY_END_TIME  publicityEndTime,
-       report.PUBLICITY_TIME  publicityTime
+       report.PUBLICITY_TIME  publicityTime,
+        to_char(info.OTHER_APPLY_TIME,'yyyy-MM-dd') otherApplyTime
 FROM   CH_DISABLE_INFO info
   LEFT JOIN CH_APR_TASK task ON info.DISAB_INFO_ID = task.DISABLE_INFO_ID
   LEFT JOIN ch_apr_report report ON report.TASK_ID = task.TASK_ID
@@ -189,7 +190,7 @@ FROM   CH_DISABLE_INFO info
     </select>
 
     <update id="placeOtherApply">
-        update CH_DISABLE_INFO set OTHER_APPLY_TIME = #{otherApplyTime}  where   DISAB_INFO_ID = #{disabInfoId}
+        update CH_DISABLE_INFO set OTHER_APPLY_TIME = TO_DATE ( #{otherApplyTime}, 'yyyy-MM-dd')   where   DISAB_INFO_ID = #{disabInfoId}
 
     </update>