Merge branch 'dev-1.0.9' into dev-1.1.0

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

@@ -1452,20 +1452,38 @@ public class MedicalViewApiController {
                 resultMap.put("message", "查询门诊记录表参数不能为空");
                 return resultMap;
             }
-            if (mzChargeDetailPageDto.getBeginTime() == null) {
+            if (StringUtils.isBlank(mzChargeDetailPageDto.getBeginTimeStr()) && mzChargeDetailPageDto.getBeginTime() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询门诊记录表开始时间参数不能为空");
                 return resultMap;
             }
-            if (mzChargeDetailPageDto.getEndTime() == null) {
+            if (StringUtils.isBlank(mzChargeDetailPageDto.getEndTimeStr()) && mzChargeDetailPageDto.getEndTime() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询门诊记录表结束时间参数不能为空");
                 return resultMap;
             }
+            //日期参数为了兼容不同的接口，设计了两个不同的字段
+            if(StringUtils.isNotBlank(mzChargeDetailPageDto.getBeginTimeStr())){
+                mzChargeDetailPageDto.setBeginTime(DateUtil.pase(mzChargeDetailPageDto.getBeginTimeStr(),"yyyy-MM-dd HH:mm:ss"));
+            }
+            if(StringUtils.isNotBlank(mzChargeDetailPageDto.getEndTimeStr())){
+                mzChargeDetailPageDto.setEndTime(DateUtil.pase(mzChargeDetailPageDto.getEndTimeStr(),"yyyy-MM-dd HH:mm:ss"));
+            }
             PageViewVo pageViewVo = new PageViewVo();
-            MzChargeDetail mzChargeDetail = new MzChargeDetail();
-            mzChargeDetail.setPayMark(PayMarkEnum.CHARGED.code);
-            mzChargeDetailPageDto.setMzChargeDetail(mzChargeDetail);
+            MzChargeDetail mzChargeDetail = mzChargeDetailPageDto.getMzChargeDetail();
+            if(mzChargeDetail==null){
+                mzChargeDetail = new MzChargeDetail();
+                mzChargeDetailPageDto.setMzChargeDetail(mzChargeDetail);
+            }
+            if(StringUtils.isBlank(mzChargeDetail.getPayMark())){
+                mzChargeDetail.setPayMark(PayMarkEnum.CHARGED.code);
+            }else {
+                if(!Arrays.asList(PayMarkEnum.CHARGED.code,PayMarkEnum.RETURN_PREMIUM.code).contains(mzChargeDetail.getPayMark())){
+                    resultMap.put("code", -1);
+                    resultMap.put("message", "订单状态参数错误");
+                    return resultMap;
+                }
+            }
             pageViewVo.setPageIndex(mzChargeDetailPageDto.getPageIndex());
             pageViewVo.setTotal(mzChargeDetailService.countMzChargeDetail(mzChargeDetailPageDto));
             mzChargeDetailPageDto.setPageSize(pageViewVo.getTotal());

src/main/java/cn/hnthyy/thmz/pageDto/MzChargeDetailPageDto.java

@@ -28,4 +28,9 @@ public class MzChargeDetailPageDto {
     private YesNoEnum ownData;
     //当前用户的Id 当只看自己的数据的时候，设置当前登录用户的id
     private String opId;
+
+    //查询的开始时间
+    private String beginTimeStr;
+    //查询的结束时间
+    private String endTimeStr;
 }