Merge branch 'dev_nursing_records_20230214' into dev_ch_master

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -24,6 +24,7 @@ import com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO;
 import com.hungraim.ltc.util.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -473,6 +474,16 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         Page<NursingRecordsRespVO> nursingRecordsRespVOPage = null;
         if("上门".equals(modeName)){
             nursingRecordsRespVOPage = chDisabAccountsDetailMapper.queryNursingRecordsGoDoor(new Page<>(nursingReqVO.getPageNum(), nursingReqVO.getPageSize()), nursingReqVO);
+            List<NursingRecordsRespVO> records = nursingRecordsRespVOPage.getRecords();
+            for (NursingRecordsRespVO record : records) {
+                String srvStartTime = record.getSrvStartTime();
+                String srvEndTime = record.getSrvEndTime();
+                if(StringUtils.isNotEmpty(srvStartTime) && StringUtils.isNotEmpty(srvEndTime)) {
+                    String time = dateDiff(srvStartTime, srvEndTime, "yyyy-MM-dd HH:mm:ss", "min");
+                    record.setIntervalTime(time);
+                }
+            }
+
         }else {
             nursingReqVO.setModeId("医疗".equals(modeName) ? "1" : "2");
             nursingRecordsRespVOPage = chDisabAccountsDetailMapper.queryNursingRecords(new Page<>(nursingReqVO.getPageNum(), nursingReqVO.getPageSize()), nursingReqVO);
@@ -480,6 +491,51 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         return nursingRecordsRespVOPage;
     }
 
+    /**
+     * 计算2个时间相差的天数、小时、分钟、秒
+     * @param startTime 开始时间
+     * @param endTime 截止时间
+     * @param format 时间格式 yyyy-MM-dd HH:mm:ss
+     * @param str 返回的数据为：day-天、hour-小时、min-分钟、second-秒
+     * @return
+     */
+    public static String dateDiff(String startTime, String endTime,  String format, String str) {
+        // 按照传入的格式生成一个simpledateformate对象
+        SimpleDateFormat sd = new SimpleDateFormat(format);
+        long nd = 1000 * 24 * 60 * 60;// 一天的毫秒数
+        long nh = 1000 * 60 * 60;// 一小时的毫秒数
+        long nm = 1000 * 60;// 一分钟的毫秒数
+        long ns = 1000;// 一秒钟的毫秒数
+        long diff;
+        long day = 0;
+        long hour = 0;
+        long min = 0;
+        long second = 0;
+        // 获得两个时间的毫秒时间差异
+        try {
+            diff = sd.parse(endTime).getTime() - sd.parse(startTime).getTime();
+            // 计算差多少天
+            day = diff / nd;
+            // 计算差多少小时
+            hour = diff / nh ;
+            // 计算差多少分钟
+            min = diff / nm ;
+            // 计算差多少秒
+            second = diff / ns;
+            // 输出结果
+            System.out.println("时间相差：" + day + "天" +
+                    (hour - day * 24) + "小时"
+                    + (min - day * 24 * 60) + "分钟" +
+                    second + "秒。");
+            /*System.out.println("hour=" + hour + ",min=" + min);*/
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        String time =  min+"分钟"+ (second - min*60) + "秒";
+        return time;
+    }
+
     @Override
     public OverallEduceDecreaseCostRespVO queryOverallCostRecords(OverallCostReqVO req) {
         return chDisabAccountsDetailMapper.queryOverallCostRecords(req);

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

@@ -41,5 +41,8 @@ public class NursingRecordsRespVO {
 
     private String realName;
 
+    private String intervalTime;
+
+
 
 }

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

@@ -84,7 +84,7 @@ public class SrvProgramController {
      * @return 返回个人照护方案列表
      */
     @RequestMapping("/programSetList")
-    public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId,String status) {
+    public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId,Long srvSendId,String status) {
         if (pageNum == null || pageNum < 1 || disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
@@ -92,7 +92,7 @@ public class SrvProgramController {
             pageSize = 10;
         }
         Page<ProgramListVo> page = new Page<>(pageNum, pageSize);
-        page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId, status);
+        page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId,srvSendId, status);
         List<ProgramListVo> records = page.getRecords();
         records =records.stream().collect(
                 Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparingLong(ProgramListVo::getProgramId))), ArrayList::new));

governance/src/main/java/com/hungraim/ltc/governance/dao/ChSrvProgramMapper.java

@@ -25,7 +25,7 @@ public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
      * @param programStatus 服务方案状态  0：未生效、1：已生效、2：已终止
      * @return 返回个人照护方案列表
      */
-    Page<ProgramListVo> getProgramList(Page<ProgramListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId, @Param("programStatus") String programStatus);
+    Page<ProgramListVo> getProgramList(Page<ProgramListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId, @Param("srvSendId")Long srvSendId ,@Param("programStatus") String programStatus);
 
     /**
      * 查看服务方案详情

governance/src/main/java/com/hungraim/ltc/governance/service/SrvProgramService.java

@@ -32,7 +32,7 @@ public interface SrvProgramService {
      * @param programStatus 服务方案状态  0：未生效、1：已生效、2：已终止
      * @return 返回个人照护方案列表
      */
-    Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId, String programStatus);
+    Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId,Long srvSendId, String programStatus);
 
     /**
      * 个人照护方案记录条数，查询对应方案状态的记录条数

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

@@ -55,8 +55,8 @@ public class SrvProgramServiceImpl implements SrvProgramService {
     }
 
     @Override
-    public Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId, String programStatus) {
-        return chSrvProgramMapper.getProgramList(page, disabInfoId, srvOrganId, programStatus);
+    public Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId,Long srvSendId, String programStatus) {
+        return chSrvProgramMapper.getProgramList(page, disabInfoId, srvOrganId, srvSendId,programStatus);
     }
 
     @Override

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

@@ -140,6 +140,9 @@
                  LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
         WHERE T1.DISAB_INFO_ID = #{disabInfoId}
           AND T1.SRV_ORGAN_ID = #{srvOrganId}
+        <if test="srvSendId != null and srvSendId != ''">
+            AND T1.SRV_SEND_ID = #{srvSendId}
+        </if>
 <!--
         <if test="programStatus != null and programStatus != ''">
             AND T1.PROG_STATUS = #{programStatus}