退费功能优化

src/main/java/cn/hnthyy/thmz/Utils/DateTimeUtils.java

@@ -0,0 +1,265 @@
+package cn.hnthyy.thmz.Utils;
+ 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Date;
+
+/**
+ * 描述:DateTimeUtils
+ *
+ * @author 何志鹏
+ * @ClassName:DateTimeUtils
+ * @create 2019-06-05 10:08
+ * Version 1.0
+ */
+public class DateTimeUtils {
+    public static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    private static ZoneId shanghaiZoneId = ZoneId.of("Asia/Shanghai");
+
+    public static void main(String[] args) {
+ 
+        System.out.println("============返回当前的日期=============");
+        System.out.println(getCurrentLocalDate());
+        System.out.println("============返回当前日期时间=============");
+        System.out.println(getCurrentLocalDateTime());
+        System.out.println("============返回当前日期字符串 yyyyMMdd=============");
+        System.out.println(getCurrentDateStr());
+        System.out.println("============返回当前日期时间字符串 yyyyMMddHHmmss=============");
+        System.out.println(getCurrentDateTimeStr());
+        System.out.println("============日期相隔天数=============");
+        //LocalDate startDateInclusive = LocalDate.of(2019, 06, 04);
+        LocalDate startDateInclusive = LocalDate.of(2019, 06, 04);
+        LocalDate endDateExclusive = LocalDate.of(2019, 06, 05);
+        System.out.println(periodDays(startDateInclusive, endDateExclusive));
+        System.out.println("============日期相隔小时=============");
+ 
+        String dt = "2019年06月04日";
+        String dt2 = "2019年06月05日";
+        SimpleDateFormat sd = new SimpleDateFormat("yyyy年MM月dd日");
+        try {
+            Instant start = sd.parse(dt).toInstant();
+            Instant end = sd.parse(dt2).toInstant();
+            System.out.println(durationHours(start, end));
+            System.out.println("============日期相隔分钟=============");
+            System.out.println(durationMinutes(start, end));
+            System.out.println("============日期相隔毫秒数=============");
+            System.out.println(durationMillis(start, end));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        System.out.println("============是否当天=============");
+        LocalDate today = LocalDate.of(2019, 06, 05);
+        System.out.println(isToday(today));
+        System.out.println("============获取本月的第一天=============");
+        System.out.println(getFirstDayOfThisMonth());
+        System.out.println("============获取本月的最后一天=============");
+        System.out.println(getLastDayOfThisMonth());
+        System.out.println("============获取2017-01的第一个周一=============");
+        System.out.println(getFirstMonday());
+        System.out.println("============获取当前日期的后两周=============");
+        System.out.println(getCurDateAfterTwoWeek());
+        System.out.println("============获取当前日期的6个月后的日期=============");
+        System.out.println(getCurDateAfterSixMonth());
+        System.out.println("============获取当前日期的5年后的日期=============");
+        System.out.println(getCurDateAfterFiveYear());
+        System.out.println("============获取当前日期的20年后的日期=============");
+        System.out.println(getCurDateAfterTwentyYear());
+ 
+ 
+    }
+
+    /**
+     * 将日期转换成localDate
+     *
+     * @return
+     */
+    public static LocalDate date2LocalDate(Date date) {
+        if(null == date) {
+            return null;
+        }
+       // return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        return date.toInstant().atZone(shanghaiZoneId).toLocalDate();
+    }
+
+
+    /**
+     * 返回当前的日期
+     *
+     * @return
+     */
+    public static LocalDate getCurrentLocalDate() {
+        return LocalDate.now();
+    }
+ 
+    /**
+     * 返回当前日期时间
+     *
+     * @return
+     */
+    public static LocalDateTime getCurrentLocalDateTime() {
+        return LocalDateTime.now();
+    }
+ 
+    /**
+     * 返回当前日期字符串 yyyyMMdd
+     *
+     * @return
+     */
+    public static String getCurrentDateStr() {
+        return LocalDate.now().format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 返回当前日期时间字符串 yyyyMMddHHmmss
+     *
+     * @return
+     */
+    public static String getCurrentDateTimeStr() {
+        return LocalDateTime.now().format(DATETIME_FORMATTER);
+    }
+ 
+    public static LocalDate parseLocalDate(String dateStr, String pattern) {
+        return LocalDate.parse(dateStr, DateTimeFormatter.ofPattern(pattern));
+    }
+ 
+    public static LocalDateTime parseLocalDateTime(String dateTimeStr, String pattern) {
+        return LocalDateTime.parse(dateTimeStr, DateTimeFormatter.ofPattern(pattern));
+    }
+
+    /**
+     * 计算日期{@code startDate}与{@code endDate}的间隔天数
+     *
+     * @param startDate
+     * @param endDate
+     * @return 间隔天数
+     */
+    public static long periodDays(LocalDate startDate, LocalDate endDate){
+        return startDate.until(endDate, ChronoUnit.DAYS);
+    }
+
+
+ 
+    /**
+     * 日期相隔小时
+     *
+     * @param startInclusive
+     * @param endExclusive
+     * @return
+     */
+    public static long durationHours(Temporal startInclusive, Temporal endExclusive) {
+        return Duration.between(startInclusive, endExclusive).toHours();
+    }
+ 
+    /**
+     * 日期相隔分钟
+     *
+     * @param startInclusive
+     * @param endExclusive
+     * @return
+     */
+    public static long durationMinutes(Temporal startInclusive, Temporal endExclusive) {
+        return Duration.between(startInclusive, endExclusive).toMinutes();
+    }
+ 
+    /**
+     * 日期相隔毫秒数
+     *
+     * @param startInclusive
+     * @param endExclusive
+     * @return
+     */
+    public static long durationMillis(Temporal startInclusive, Temporal endExclusive) {
+        return Duration.between(startInclusive, endExclusive).toMillis();
+    }
+ 
+    /**
+     * 是否当天
+     *
+     * @param date
+     * @return
+     */
+    public static boolean isToday(LocalDate date) {
+        return getCurrentLocalDate().equals(date);
+    }
+ 
+    /**
+     * 获取本月的第一天
+     *
+     * @return
+     */
+    public static String getFirstDayOfThisMonth() {
+        return getCurrentLocalDate().with(TemporalAdjusters.firstDayOfMonth()).format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 获取本月的最后一天
+     *
+     * @return
+     */
+    public static String getLastDayOfThisMonth() {
+        return getCurrentLocalDate().with(TemporalAdjusters.lastDayOfMonth()).format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 获取2017-01的第一个周一
+     *
+     * @return
+     */
+    public static String getFirstMonday() {
+        return LocalDate.parse("2017-01-01").with(TemporalAdjusters.firstInMonth(DayOfWeek.MONDAY))
+                .format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 获取当前日期的后两周
+     *
+     * @return
+     */
+    public static String getCurDateAfterTwoWeek() {
+        return getCurrentLocalDate().plus(2, ChronoUnit.WEEKS).format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 获取当前日期的6个月后的日期
+     *
+     * @return
+     */
+    public static String getCurDateAfterSixMonth() {
+        return getCurrentLocalDate().plus(6, ChronoUnit.MONTHS).format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 获取当前日期的5年后的日期
+     *
+     * @return
+     */
+    public static String getCurDateAfterFiveYear() {
+        return getCurrentLocalDate().plus(5, ChronoUnit.YEARS).format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 获取当前日期的20年后的日期
+     *
+     * @return
+     */
+    public static String getCurDateAfterTwentyYear() {
+        return getCurrentLocalDate().plus(2, ChronoUnit.DECADES).format(DATE_FORMATTER);
+    }
+ 
+    /**
+     * 字符串转时间
+     *
+     * @return
+     */
+    public static LocalDate stringToDate(String time) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return LocalDate.parse(time, formatter);
+    }
+ 
+}

src/main/java/cn/hnthyy/thmz/controller/ChargeFeeVoController.java

@@ -1,5 +1,6 @@
 package cn.hnthyy.thmz.controller;
 
+import cn.hnthyy.thmz.Utils.DateTimeUtils;
 import cn.hnthyy.thmz.Utils.DateUtil;
 import cn.hnthyy.thmz.Utils.ExcelUtil;
 import cn.hnthyy.thmz.Utils.TokenUtil;
@@ -1004,6 +1005,11 @@ public class ChargeFeeVoController {
                 resultMap.put("message", "查询门诊收费明细失败,结束时间为空");
                 return resultMap;
             }
+            if(DateTimeUtils.periodDays(DateTimeUtils.date2LocalDate(thmzmxsrParamsVo.getBeginDate()), DateTimeUtils.date2LocalDate(thmzmxsrParamsVo.getEndDate()))>31){
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询门诊收费明细失败,时间跨度不能大于一个月");
+                return resultMap;
+            }
             List<MzPatientMi> mzPatientMis = mzPatientMiService.queryByCommonParams(thmzmxsrParamsVo.getCommonParams());
             if (mzPatientMis != null && mzPatientMis.size() > 0) {
                 List<String> patientIds = mzPatientMis.stream().filter(m -> StringUtils.isNotBlank(m.getPatientId())).map(m -> m.getPatientId()).collect(Collectors.toList());

src/main/java/cn/hnthyy/thmz/controller/MzChargeDetailController.java

@@ -410,6 +410,11 @@ public class MzChargeDetailController {
                 resultMap.put("message", "病人就诊次数不能为空");
                 return resultMap;
             }
+            if (mzChargeDetail.getReceiptNo() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "病人就缴费次数不能为空");
+                return resultMap;
+            }
             mzChargeDetail.setPayMark(PayMarkEnum.CHARGED.code);
             List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.queryChargeDetail(mzChargeDetail);
             List<MzBillItem> mzBillItems = mzBillItemService.queryMzBillItem();
@@ -472,6 +477,11 @@ public class MzChargeDetailController {
                 resultMap.put("message", "病人就诊次数参数不能为空");
                 return resultMap;
             }
+            if (mzDepositFileVo.getReceiptNo() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "病人结算次数参数不能为空");
+                return resultMap;
+            }
             if (StringUtils.isBlank(mzDepositFileVo.getChargeItemCodes())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "没有选择需要退费的收费明细，无法退费");
@@ -490,6 +500,13 @@ public class MzChargeDetailController {
             mzChargeDetailPageDto.getMzChargeDetail().setPayMark(PayMarkEnum.CHARGED.code);
             List<MzChargeDetail> oriMzChargeDetails = mzChargeDetailService.queryMzChargeDetailWithPage(mzChargeDetailPageDto);
             MzChargeDetail oriMzChargeDetail = oriMzChargeDetails.get(0);
+            if(oriMzChargeDetails.size()>1){
+                for (MzChargeDetail mz:oriMzChargeDetails){
+                    if(mz.getReceiptNo().equals(mzDepositFileVo.getReceiptNo())){
+                        oriMzChargeDetail=mz;
+                    }
+                }
+            }
             if (oriMzChargeDetail.getAmount() != null) {
                 oriMzChargeDetail.setAmount(oriMzChargeDetail.getAmount().setScale(1, BigDecimal.ROUND_HALF_UP));
             }

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -10,6 +10,7 @@ import cn.hnthyy.thmz.entity.his.*;
 import cn.hnthyy.thmz.enums.PayMarkEnum;
 import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.pageDto.MzChargeDetailPageDto;
+import cn.hnthyy.thmz.pageDto.ZdUnitCodePageDto;
 import cn.hnthyy.thmz.service.his.*;
 import cn.hnthyy.thmz.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +45,10 @@ public class MedicalViewApiController {
     private MzBillItemService mzBillItemService;
     @Autowired
     private APatientMiService aPatientMiService;
+    @Autowired
+    private ZdMzClassService zdMzClassService;
+
+
     //海慈身份证类型
     private static final String ID_CARD_TYPE = "11";
     //海慈参数男性
@@ -796,6 +801,83 @@ public class MedicalViewApiController {
     }
 
 
+
+    /**
+     * 查询挂号科室分类
+     *
+     * @return
+     */
+    @RequestMapping(value = "/getMzClass", method = {RequestMethod.GET})
+    public Map<String, Object> getMzClass() {
+        Map<String, Object> results = new HashMap<>();
+        List<ZdMzClass> zdMzClassList = zdMzClassService.queryAllZdMzClass();
+        if (zdMzClassList == null || zdMzClassList.size() == 0) {
+            results.put("resultCode", -1);
+            results.put("resultMessage", "没有查询挂号科室分类");
+            return results;
+        }
+        results.put("resultCode", 0);
+        results.put("data", zdMzClassList);
+        return results;
+    }
+
+
+
+
+    /**
+     * 根据门诊科室分类码查询科室列表
+     *
+     * @return
+     */
+    @RequestMapping(value = "/getUnitCodeByMzClass", method = {RequestMethod.POST})
+    public Map<String, Object> getUnitCodeByMzClass(@RequestBody ZdUnitCode zdUnitCode) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (zdUnitCode == null) {
+                resultMap.put("resultCode", -1);
+                resultMap.put("resultMessage", "查询科室列表失败，参数为空");
+                return resultMap;
+            }
+            if (StringUtils.isBlank(zdUnitCode.getMzClass())) {
+                resultMap.put("resultCode", -1);
+                resultMap.put("resultMessage", "查询科室列表失败，门诊分类码为空");
+                return resultMap;
+            }
+            ZdUnitCodePageDto zdUnitCodePageDto = new ZdUnitCodePageDto();
+            zdUnitCode.setDelFlag(YesNoEnum.NO.code);
+            zdUnitCode.setMzFlag(YesNoEnum.YES.code);
+            zdUnitCode.setClassCode(YesNoEnum.YES.code);
+            zdUnitCodePageDto.setOrderByCase("sort_code");
+            zdUnitCodePageDto.setZdUnitCode(zdUnitCode);
+            List<ZdUnitCode> zdUnitCodeList = zdUnitCodeService.queryZdUnitCode(zdUnitCodePageDto);
+            if (zdUnitCodeList == null || zdUnitCodeList.size() == 0) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "没有查询到符合条件的科室列表");
+                return resultMap;
+            }
+            resultMap.put("resultCode", 0);
+            resultMap.put("data", zdUnitCodeList);
+            return resultMap;
+        }catch (Exception e){
+            log.error("系统异常，请联系管理员");
+            resultMap.put("code", -1);
+            resultMap.put("message", "没有查询到符合条件的科室列表");
+            return resultMap;
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 查询门诊记录表 医患通已收费记录查询
      *

src/main/java/cn/hnthyy/thmz/mapper/his/MzChargeDetailMapper.java

@@ -314,9 +314,12 @@ public interface MzChargeDetailMapper {
                     " and pay_mark=#{payMark,jdbcType=CHAR} " +
                     "</otherwise>" +
                     "</choose>" +
+                    "<when test='receiptNo!=null'>",
+            " and receipt_no=#{receiptNo} ",
+            "</when>",
                     "order by order_no desc",
             "</script>"})
-    List<MzChargeDetail> selectMzChargeDetailByPatientId(@Param("patientId") String patientId, @Param("times") Integer times, @Param("payMark") String payMark);
+    List<MzChargeDetail> selectMzChargeDetailByPatientId(@Param("patientId") String patientId, @Param("times") Integer times,@Param("receiptNo") Integer receiptNo, @Param("payMark") String payMark);
 
     /**
      * 根据当期那病人与就诊次数以及收费编码查询对应的药品数量与退药量

src/main/java/cn/hnthyy/thmz/mapper/his/ZdUnitCodeMapper.java

@@ -286,7 +286,13 @@ public interface ZdUnitCodeMapper {
             "<when test='zdUnitCode.ghjzFlag!=null'>",
             " and ghjz_flag =#{zdUnitCode.ghjzFlag,jdbcType=CHAR}",
             "</when>",
+            "<when test='zdUnitCode.mzClass!=null'>",
+            " and mz_class =#{zdUnitCode.mzClass,jdbcType=CHAR}",
+            "</when>",
             " order by ${orderByCase} asc",
             "</script>"})
     List<ZdUnitCode> selectZdUnitCode(ZdUnitCodePageDto zdUnitCodePageDto);
+
+
+
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/MzChargeDetailServiceImpl.java

@@ -243,7 +243,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         List<MzChargeDetail> mzChargeDetails = new ArrayList<>();
         List<MzYjReq> mzYjReqs = mzYjReqService.queryNotPayMzYjReq(new MzYjReq(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes()));
         MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzChargeDetail.getPatientId());
-        List<MzChargeDetail> mzChargeDetailList = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), PayMarkEnum.NO_CHARGE.code);
+        List<MzChargeDetail> mzChargeDetailList = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(),null, PayMarkEnum.NO_CHARGE.code);
         Integer maxOrderNo = 0;
         Integer itemNo = 100;
         Date priceTime = null;
@@ -380,7 +380,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         //入库收费明细数据结束
 
         MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzDepositFileVo.getPatientId());
-        List<MzChargeDetail> mzChargeDetailList = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), PayMarkEnum.NO_CHARGE.code);
+        List<MzChargeDetail> mzChargeDetailList = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(),null, PayMarkEnum.NO_CHARGE.code);
         //所有应收费用的明细 将所有费用按照类型归类
         Map<String, BigDecimal> feeMap = new HashMap<>();
         //实际应付金额
@@ -965,7 +965,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
 
     @Override
     public List<MzChargeDetail> queryChargeDetail(MzChargeDetail mzChargeDetail) {
-        return mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), mzChargeDetail.getPayMark());
+        return mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(),mzChargeDetail.getReceiptNo(), mzChargeDetail.getPayMark());
     }
 
     @Override
@@ -994,7 +994,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         //是否全退
         boolean allRefund = mzChargeDetails == null || mzChargeDetails.size() == 0;
         List<String> chargeItemCodeList = mzChargeDetails.stream().filter(u -> StringUtils.isNotBlank(u.getChargeItemCode())).map(u -> u.getChargeItemCode()).collect(Collectors.toList());
-        List<MzChargeDetail> oriMzChargeDetails = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), PayMarkEnum.CHARGED.code);
+        List<MzChargeDetail> oriMzChargeDetails = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(),null, PayMarkEnum.CHARGED.code);
         Date now = new Date();
         List<MzChargeDetail> tcMzChargeDetails = new ArrayList<>();
         List<MzChargeDetail> removeMzChargeDetails = new ArrayList<>();
@@ -1300,7 +1300,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (chargeItemCodeList == null || chargeItemCodeList.size() == 0) {
             throw new MzException("没有选择需要退费的收费明细，无法退费");
         }
-        List<MzChargeDetail> mzChargeDetails = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), PayMarkEnum.CHARGED.code);
+        List<MzChargeDetail> mzChargeDetails = mzChargeDetailMapper.selectMzChargeDetailByPatientId(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(),mzDepositFileVo.getReceiptNo(), PayMarkEnum.CHARGED.code);
         if (mzChargeDetails == null || mzChargeDetails.size() == 0) {
             throw new MzException("当前病人无可退费用，无法退费");
         }

src/main/resources/static/js/toll_administration.js

@@ -1702,7 +1702,7 @@ function initRefundFeeDetailTable(patientId, times, receiptNo) {
         sortable: true,                     //是否启用排序
         sortOrder: "asc",                   //排序方式
         // sortName: 'orderNo',                //排序字段
-        queryParams: queryParamsForRefundFee(patientId, times),           //传递参数（*）
+        queryParams: queryParamsForRefundFee(patientId, times,receiptNo),           //传递参数（*）
         sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
         pageNumber: 1,                       //初始化加载第一页，默认第一页
         pageSize: 10,                       //每页的记录行数（*）
@@ -1895,10 +1895,11 @@ function initRefundFeeDetailTable(patientId, times, receiptNo) {
  * @param times
  * @returns {{patientId: *, times: *}}
  */
-function queryParamsForRefundFee(patientId, times) {
+function queryParamsForRefundFee(patientId, times,receiptNo) {
     var temp = {
         patientId: patientId,
         times: times,
+        receiptNo:receiptNo
     };
     return temp;
 };
@@ -1921,6 +1922,7 @@ function getRefundFee() {
         data: JSON.stringify({
             patientId: $("#patientIdRefund").val(),
             times: $("#timesRefund").val(),
+            receiptNo:$("#receiptNoRefund").val(),
             chargeItemCodes: chargeItemCodes
         }),
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -2101,6 +2103,7 @@ function queryParamsForRefundDetail(chargeItemCodes) {
     return {
         patientId: $("#patientIdRefund").val(),
         times: $("#timesRefund").val(),
+        receiptNo:$("#receiptNoRefund").val(),
         chargeItemCodes: chargeItemCodes
     };
 };