号表维护功能优化

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

@@ -117,7 +117,7 @@ public class CommonController {
         try {
             resultMap.put("code", 0);
             resultMap.put("message", "查询门诊挂号时间区间成功");
-            resultMap.put("data", mzZdWorkTimeService.queryAllMzZdWorkTime());
+            resultMap.put("data", mzZdWorkTimeService.queryAllInUsedMzZdWorkTime());
             return resultMap;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/cn/hnthyy/thmz/controller/mz/MzyRequestController.java

@@ -4,16 +4,10 @@ import cn.hnthyy.thmz.Utils.CloneUtil;
 import cn.hnthyy.thmz.Utils.DateUtil;
 import cn.hnthyy.thmz.Utils.TokenUtil;
 import cn.hnthyy.thmz.comment.UserLoginToken;
-import cn.hnthyy.thmz.entity.his.mz.Employee;
-import cn.hnthyy.thmz.entity.his.mz.MzPatientMi;
-import cn.hnthyy.thmz.entity.his.mz.MzyRequest;
-import cn.hnthyy.thmz.entity.his.mz.MzyZdChargeType;
+import cn.hnthyy.thmz.entity.his.mz.*;
 import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
 import cn.hnthyy.thmz.entity.thmz.User;
-import cn.hnthyy.thmz.service.his.mz.EmployeeService;
-import cn.hnthyy.thmz.service.his.mz.MzPatientMiService;
-import cn.hnthyy.thmz.service.his.mz.MzyRequestService;
-import cn.hnthyy.thmz.service.his.mz.MzyZdChargeTypeService;
+import cn.hnthyy.thmz.service.his.mz.*;
 import cn.hnthyy.thmz.service.his.zd.ZdUnitCodeService;
 import cn.hnthyy.thmz.pageDto.EmployeePageDto;
 import cn.hnthyy.thmz.vo.RequestParamsVo;
@@ -41,6 +35,8 @@ public class MzyRequestController {
     private MzyZdChargeTypeService mzyZdChargeTypeService;
     @Autowired
     private MzPatientMiService mzPatientMiService;
+    @Autowired
+    private MzZdWorkTimeService mzZdWorkTimeService;
 
 
     /**
@@ -556,6 +552,13 @@ public class MzyRequestController {
             mzyZdChargeTypeMap = mzyZdChargeTypes.stream().collect(Collectors.toMap(MzyZdChargeType::getCode, MzyZdChargeType::getName));
         }
         Map<String, String> finalMzyZdChargeTypeMap = mzyZdChargeTypeMap;
+
+        List<MzZdWorkTime> mzZdWorkTimes=mzZdWorkTimeService.queryAllMzZdWorkTime();
+        Map<String, String> mzZdWorkTimeMap = null;
+        if (mzZdWorkTimes != null) {
+            mzZdWorkTimeMap = mzZdWorkTimes.stream().collect(Collectors.toMap(MzZdWorkTime::getCode, MzZdWorkTime::getName));
+        }
+        Map<String, String> finalMzZdWorkTimeMap =mzZdWorkTimeMap;
         newMzyRequest.stream().forEach(m -> {
             if (StringUtils.isNotBlank(m.getUnitCode())) {
                 String unitName = zdUnitCodeService.queryDeptNameByIdInCache(m.getUnitCode());
@@ -576,6 +579,10 @@ public class MzyRequestController {
             if (m.getRequestDay() != null) {
                 m.setRequestDay(DateUtil.getFirstSecond(m.getRequestDay()));
             }
+            if (StringUtils.isNotBlank(m.getAmpm()) && finalMzZdWorkTimeMap!=null) {
+                String mzZdWorkTime = finalMzZdWorkTimeMap.get(m.getAmpm());
+                m.setAmpmName(mzZdWorkTime == null ? "" : mzZdWorkTime);
+            }
         });
     }
 

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzyRequest.java

@@ -69,5 +69,7 @@ public class MzyRequest implements Serializable{
     private String doctorCodeOld;
     //号别  老系统表维护的时候的组合键
     private String chargeTypeOld;
+    //号段描述
+    private String ampmName;
 
 }

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzZdWorkTimeMapper.java

@@ -7,12 +7,19 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 
 public interface MzZdWorkTimeMapper {
+    /**
+     * 查询所有的时间区间
+     * @return
+     */
+    @Select("select rtrim(code) code,rtrim(name) name,rtrim(start_time) start_time,rtrim(end_time) end_time,del_flag from mz_zd_work_time WITH(NOLOCK) order by code")
+    List<MzZdWorkTime> selectAllMzZdWorkTime();
+
     /**
      * 查询所有在使用中的时间区间
      * @return
      */
     @Select("select rtrim(code) code,rtrim(name) name,rtrim(start_time) start_time,rtrim(end_time) end_time,del_flag from mz_zd_work_time WITH(NOLOCK) where del_flag =0 order by code")
-    List<MzZdWorkTime> selectAllMzZdWorkTime();
+    List<MzZdWorkTime> selectAllInUsedMzZdWorkTime();
 
     /**
      * 根据编码查询在使用中的时间区间

src/main/java/cn/hnthyy/thmz/service/his/mz/MzZdWorkTimeService.java

@@ -6,11 +6,17 @@ import java.util.List;
 
 public interface MzZdWorkTimeService {
     /**
-     * 查询所有在使用中的时间区间 号段
+     * 查询所有的时间区间
      * @return
      */
     List<MzZdWorkTime> queryAllMzZdWorkTime();
 
+    /**
+     * 查询所有在使用中的时间区间 号段
+     * @return
+     */
+    List<MzZdWorkTime> queryAllInUsedMzZdWorkTime();
+
     /**
      * 查询所有在使用中的时间区间
      * @param code

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzZdWorkTimeServiceImpl.java

@@ -18,11 +18,17 @@ public class MzZdWorkTimeServiceImpl implements MzZdWorkTimeService {
     @SuppressWarnings("all")
     @Autowired
     private MzZdWorkTimeMapper mzZdWorkTimeMapper;
+
     @Override
     public List<MzZdWorkTime> queryAllMzZdWorkTime() {
         return mzZdWorkTimeMapper.selectAllMzZdWorkTime();
     }
 
+    @Override
+    public List<MzZdWorkTime> queryAllInUsedMzZdWorkTime() {
+        return mzZdWorkTimeMapper.selectAllInUsedMzZdWorkTime();
+    }
+
     @Override
     public MzZdWorkTime queryMzZdWorkTimeByCode(String code) {
         return mzZdWorkTimeMapper.selectMzZdWorkTimeByCode(code);

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -890,7 +890,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         if (chequeTypes != null) {
             chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
         }
-        List<MzZdWorkTime> workTimes = mzZdWorkTimeMapper.selectAllMzZdWorkTime();
+        List<MzZdWorkTime> workTimes = mzZdWorkTimeMapper.selectAllInUsedMzZdWorkTime();
         Map<String, String> workTimeMap = null;
         if (workTimes != null) {
             workTimeMap = workTimes.stream().collect(Collectors.toMap(MzZdWorkTime::getCode, MzZdWorkTime::getName));

src/main/resources/static/js/mz/request.js

@@ -253,29 +253,10 @@ function initSourceList() {
                     return format(value, "yyyy-MM-dd");
                 }
             }, {
-                field: 'ampm',
+                field: 'ampmName',
                 title: '号段',
                 align: "center",
                 valign: 'middle',
-                formatter: function (value, row, index) {
-                    var text;
-                    if(value=='a'){
-                        text='上午';
-                    } else if (value == 'p') {
-                        text = '下午';
-                    } else if (value == 'd') {
-                        text = '全天';
-                    }else if (value == 'n') {
-                        text = '中午';
-                    }else if (value == 'e') {
-                        text = '晚班';
-                    }else if (value == 'l') {
-                        text = '夜班';
-                    }else {
-                        text= value;
-                    }
-                    return text;
-                }
             }, {
                 field: 'unitName',
                 title: '科室',