Merge branch 'dev-1.0.9' into dev-1.1.0

# Conflicts:
#	src/main/java/cn/hnthyy/thmz/controller/NavigationController.java

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

@@ -0,0 +1,168 @@
+package cn.hnthyy.thmz.controller;
+
+import cn.hnthyy.thmz.Utils.TokenUtil;
+import cn.hnthyy.thmz.comment.UserLoginToken;
+import cn.hnthyy.thmz.entity.thmz.Holidays;
+import cn.hnthyy.thmz.entity.thmz.User;
+import cn.hnthyy.thmz.service.thmz.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@Slf4j
+@RestController
+public class HolidaysController {
+    @Autowired
+    private HolidaysService holidaysService;
+    /**
+     * 保存节假日
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/saveHolidays", method = {RequestMethod.POST})
+    public Map<String, Object> saveHolidays(@RequestBody Holidays holidays, HttpServletRequest httpServletRequest) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (holidays == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "保存节假日失败,参数为空");
+                return resultMap;
+            }
+            if (holidays.getBeginDate() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "保存节假日失败,开始时间为空");
+                return resultMap;
+            }
+            if (StringUtils.isBlank(holidays.getBeginAmpm())) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "保存节假日失败,开始日期的时间段为空");
+                return resultMap;
+            }
+            if (holidays.getEndDate() == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "保存节假日失败,结束时间为空");
+                return resultMap;
+            }
+            if (StringUtils.isBlank(holidays.getBeginAmpm())) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "保存节假日失败,结束日期的时间段为空");
+                return resultMap;
+            }
+            User tokenUser = TokenUtil.getUser(httpServletRequest);
+            resultMap.put("code", 0);
+            resultMap.put("message", "保存节假日成功");
+            holidays.setCreateId(tokenUser.getId());
+            holidays.setCreateDate(new Date());
+            holidaysService.saveHolidays(holidays);
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("保存节假日失败，错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "保存节假日失败,错误原因【"+e.getMessage()+"】");
+            return resultMap;
+        }
+    }
+
+
+    /**
+     * 根据id查询节假日
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getHolidaysById", method = {RequestMethod.GET})
+    public Map<String, Object> getHolidaysById(@RequestParam("id") Long id) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (id == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询节假日失败,参数为空");
+                return resultMap;
+            }
+            resultMap.put("code", 0);
+            resultMap.put("message", "查询节假日成功");
+            Holidays holidays = holidaysService.queryById(id);
+            resultMap.put("data", holidays);
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据id查询节假日失败，错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "根据id查询节假日失败");
+            return resultMap;
+        }
+    }
+
+
+    /**
+     *
+     * 删除节假日
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/removeHolidaysById", method = {RequestMethod.GET})
+    public Map<String, Object> removeHolidaysById(@RequestParam("id") Long id) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (id == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "删除节假日失败,参数为空");
+                return resultMap;
+            }
+            int num = holidaysService.removeHolidays(id);
+            if (num == 1) {
+                resultMap.put("code", 0);
+                resultMap.put("message", "删除节假日成功");
+                return resultMap;
+            }
+            resultMap.put("code", -1);
+            resultMap.put("message", "删除节假日失败");
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("删除节假日失败，错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "删除节假日失败");
+            return resultMap;
+        }
+    }
+
+
+    /**
+     * 查询节假日排班
+     *
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getHolidays", method = {RequestMethod.POST})
+    public Map<String, Object> getHolidays(@RequestBody Holidays holidays) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (holidays == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "查询节假日失败,参数为空");
+                return resultMap;
+            }
+            resultMap.put("code", 0);
+            resultMap.put("message", "查询节假日成功");
+            Integer count = holidaysService.queryCountHolidays(holidays);
+            List<Holidays> holidaysList = holidaysService.queryHolidaysWithPage(holidays);
+            resultMap.put("data", holidaysList);
+            resultMap.put("count", count);
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("节假日失败，错误信息{}", e.getMessage());
+            resultMap.put("code", -1);
+            resultMap.put("message", "节假日失败");
+            return resultMap;
+        }
+    }
+
+}

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

@@ -28,14 +28,17 @@ public class NavigationController {
 
     /**
      * 打开登录页面
+     *
      * @return
      */
     @RequestMapping("/login/view")
     public String loginView() {
         return "login";
     }
+
     /**
      * 打开导航页面
+     *
      * @return
      */
     @RequestMapping("/menu/view")
@@ -45,12 +48,13 @@ public class NavigationController {
 
     /**
      * 打开主页面
+     *
      * @return
      */
     @RequestMapping("/index")
     public String index(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/index")){
+        if (!urls.contains("/thmz/index")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "index";
@@ -58,24 +62,27 @@ public class NavigationController {
 
     /**
      * 打开科室列表页面
+     *
      * @return
      */
     @RequestMapping("/unit-code")
     public String unitCode(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/unit-code")){
+        if (!urls.contains("/thmz/unit-code")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "unit_code";
     }
+
     /**
      * 打开挂号管理页面
+     *
      * @return
      */
     @RequestMapping("/registration")
     public String registration(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/registration")){
+        if (!urls.contains("/thmz/registration")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "registration";
@@ -83,12 +90,13 @@ public class NavigationController {
 
     /**
      * 打开挂号列表页面
+     *
      * @return
      */
     @RequestMapping("/registration-list")
     public String registrationList(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/registration-list")){
+        if (!urls.contains("/thmz/registration-list")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "registration_list";
@@ -96,35 +104,38 @@ public class NavigationController {
 
     private List<String> getUrls(HttpServletRequest httpServletRequest) throws Exception {
         User tokenUser = TokenUtil.getUser(httpServletRequest);
-        List<UserMenuRelation> userMenuRelationList= userMenuRelationService.queryByUserId(tokenUser.getId());
-        List<Long> menuIds=userMenuRelationList.stream().map(UserMenuRelation::getMenuId).collect(Collectors.toList());
-        if(menuIds==null || menuIds.size()==0){
+        List<UserMenuRelation> userMenuRelationList = userMenuRelationService.queryByUserId(tokenUser.getId());
+        List<Long> menuIds = userMenuRelationList.stream().map(UserMenuRelation::getMenuId).collect(Collectors.toList());
+        if (menuIds == null || menuIds.size() == 0) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        List<Menu> menuList= menuService.queryByIds(menuIds);
+        List<Menu> menuList = menuService.queryByIds(menuIds);
         return menuList.stream().map(Menu::getMenuUrl).collect(Collectors.toList());
     }
 
     /**
      * 打开收费管理页面
+     *
      * @return
      */
     @RequestMapping("/toll-administration")
     public String tollAdministration(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/toll-administration")){
+        if (!urls.contains("/thmz/toll-administration")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "toll_administration";
     }
+
     /**
      * 打开收费员基础设置页面
+     *
      * @return
      */
     @RequestMapping("/sfy-config")
     public String sfyConfig(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/sfy-config")){
+        if (!urls.contains("/thmz/sfy-config")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "sfy_config";
@@ -132,12 +143,13 @@ public class NavigationController {
 
     /**
      * 打印机设置页面
+     *
      * @return
      */
     @RequestMapping("/print-config")
     public String printConfig(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/print-config")){
+        if (!urls.contains("/thmz/print-config")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "print_config";
@@ -145,12 +157,13 @@ public class NavigationController {
 
     /**
      * 打开发票管理页面
+     *
      * @return
      */
     @RequestMapping("/receipt")
     public String receipt(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/receipt")){
+        if (!urls.contains("/thmz/receipt")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "receipt";
@@ -159,27 +172,28 @@ public class NavigationController {
 
     /**
      * 打开日结处理页面
+     *
      * @return
      */
     @RequestMapping("/daily")
     public String daily(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/daily")){
+        if (!urls.contains("/thmz/daily")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "daily";
     }
 
 
-
     /**
      * 打开重打日结报表页面
+     *
      * @return
      */
     @RequestMapping("/daily-repeat-print")
     public String dailyRepeatPrint(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/daily-repeat-print")){
+        if (!urls.contains("/thmz/daily-repeat-print")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "daily_repeat_print";
@@ -187,12 +201,13 @@ public class NavigationController {
 
     /**
      * 日结汇总页面
+     *
      * @return
      */
     @RequestMapping("/daily-collect")
     public String dailyCollect(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/daily-collect")){
+        if (!urls.contains("/thmz/daily-collect")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "daily_collect";
@@ -200,12 +215,13 @@ public class NavigationController {
 
     /**
      * 病人费用清单
+     *
      * @return
      */
     @RequestMapping("/charge-list")
     public String chargeList(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/charge-list")){
+        if (!urls.contains("/thmz/charge-list")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "charge_list";
@@ -214,27 +230,28 @@ public class NavigationController {
 
     /**
      * 退药申请
+     *
      * @return
      */
     @RequestMapping("/refund-medicine")
     public String refundMedicine(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/refund-medicine")){
+        if (!urls.contains("/thmz/refund-medicine")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "refund_medicine";
     }
 
 
-
     /**
      * 门诊收入明细
+     *
      * @return
      */
     @RequestMapping("/mzsrmx")
     public String mzsrmx(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/mzsrmx")){
+        if (!urls.contains("/thmz/mzsrmx")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "mzsrmx";
@@ -243,12 +260,13 @@ public class NavigationController {
 
     /**
      * 门诊号别统计
+     *
      * @return
      */
     @RequestMapping("/mzhbtj")
     public String mzhbtj(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/mzhbtj")){
+        if (!urls.contains("/thmz/mzhbtj")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "mzhbtj";
@@ -257,12 +275,13 @@ public class NavigationController {
 
     /**
      * 门诊应收核算报表
+     *
      * @return
      */
     @RequestMapping("/bissinessReport")
     public String bissinessReport(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/bissinessReport")){
+        if (!urls.contains("/thmz/bissinessReport")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "bissinessReport";
@@ -270,12 +289,13 @@ public class NavigationController {
 
     /**
      * 号表字典维护
+     *
      * @return
      */
     @RequestMapping("/request")
     public String request(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/request")){
+        if (!urls.contains("/thmz/request")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "request";
@@ -283,12 +303,13 @@ public class NavigationController {
 
     /**
      * 收费员工作量统计
+     *
      * @return
      */
     @RequestMapping("/cash-work-count")
     public String cashWorkCount(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/cash-work-count")){
+        if (!urls.contains("/thmz/cash-work-count")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "cash_work_count";
@@ -297,12 +318,13 @@ public class NavigationController {
 
     /**
      * 菜单管理页面
+     *
      * @return
      */
     @RequestMapping("/menu-manage")
     public String menuManage(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/menu-manage")){
+        if (!urls.contains("/thmz/menu-manage")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "menu_manage";
@@ -310,12 +332,13 @@ public class NavigationController {
 
     /**
      * 菜单权限设置管理页面
+     *
      * @return
      */
     @RequestMapping("/user-menu-relation")
     public String userMenuRelation(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/user-menu-relation")){
+        if (!urls.contains("/thmz/user-menu-relation")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "user_menu_relation";
@@ -324,12 +347,13 @@ public class NavigationController {
 
     /**
      * 号表预警设置页面
+     *
      * @return
      */
     @RequestMapping("/request-config")
     public String requestConfig(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/request-config")){
+        if (!urls.contains("/thmz/request-config")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "request-config";
@@ -337,12 +361,13 @@ public class NavigationController {
 
     /**
      * 医技预约科室设置页面
+     *
      * @return
      */
     @RequestMapping("/schedule-of-medical")
     public String scheduleOfMedical(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/schedule-of-medical")){
+        if (!urls.contains("/thmz/schedule-of-medical")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "schedule-of-medical";
@@ -351,12 +376,13 @@ public class NavigationController {
 
     /**
      * 医技预约科室预约页面
+     *
      * @return
      */
     @RequestMapping("/schedule-of-medical-apply")
     public String scheduleOfMedicalApply(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/schedule-of-medical-apply")){
+        if (!urls.contains("/thmz/schedule-of-medical-apply")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "schedule-of-medical-apply";
@@ -365,12 +391,13 @@ public class NavigationController {
 
     /**
      * 文件上传页面
+     *
      * @return
      */
     @RequestMapping("/profile-common")
     public String profileCommon(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/profile-common")){
+        if (!urls.contains("/thmz/profile-common")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "profile_common";
@@ -379,14 +406,30 @@ public class NavigationController {
 
     /**
      * 入院登记
+     *
      * @return
      */
     @RequestMapping("/hospitalized")
     public String hospitalized(HttpServletRequest httpServletRequest) throws Exception {
         List<String> urls = getUrls(httpServletRequest);
-        if(!urls.contains("/thmz/hospitalized")){
+        if (!urls.contains("/thmz/hospitalized")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
         return "hospitalized";
     }
+
+    
+    /**
+     * 节假日配置挂号
+     *
+     * @return
+     */
+    @RequestMapping("/request-holidays-config")
+    public String requestHolidaysConfig(HttpServletRequest httpServletRequest) throws Exception {
+        List<String> urls = getUrls(httpServletRequest);
+        if (!urls.contains("/thmz/request-holidays-config")) {
+            throw new Exception("您没有此模块的权限，请联系管理员开通！");
+        }
+        return "request_holidays_config";
+    }
 }

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

@@ -7,12 +7,14 @@ import cn.hnthyy.thmz.entity.MzException;
 import cn.hnthyy.thmz.entity.haici.HaiciCharge;
 import cn.hnthyy.thmz.entity.haici.Haicipat;
 import cn.hnthyy.thmz.entity.his.*;
+import cn.hnthyy.thmz.entity.thmz.Holidays;
 import cn.hnthyy.thmz.enums.PayMarkEnum;
 import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.pageDto.MzChargeDetailPageDto;
 import cn.hnthyy.thmz.pageDto.MzyReqrecPageDto;
 import cn.hnthyy.thmz.pageDto.ZdUnitCodePageDto;
 import cn.hnthyy.thmz.service.his.*;
+import cn.hnthyy.thmz.service.thmz.HolidaysService;
 import cn.hnthyy.thmz.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -59,6 +61,8 @@ public class MedicalViewApiController {
     private MzZdWorkTimeService mzZdWorkTimeService;
     @Autowired
     private MzyReqrecService mzyReqrecService;
+    @Autowired
+    private HolidaysService holidaysService;
 
     //海慈身份证类型
     private static final String ID_CARD_TYPE = "11";
@@ -76,7 +80,8 @@ public class MedicalViewApiController {
     private static final String WX = "WX";
     //支付宝
     private static final String ZFB = "ZFB";
-
+    //驾驶员体检中心编码
+    private static final String JZYTZJX="1500010";
     /**
      * 患者信息查询
      *
@@ -1201,16 +1206,43 @@ public class MedicalViewApiController {
                         fee = fee.add(mzyZdChargeType.getReqFee()).add(mzyZdChargeType.getClinicFee()).add(mzyZdChargeType.getOthFee());
                     }
                 }
+                String ampm =(String) map.get("ampm");
                 BigDecimal checkFee = (BigDecimal) map.get("checkFee");
                 if (checkFee == null) {
                     checkFee = BigDecimal.ZERO;
                 }
                 fee = fee.add(checkFee);
-                //周末挂号费为0，不收挂号费
-                Calendar cal = Calendar.getInstance();
-                cal.setTime(requestDayD);
-                if ((cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY && Constants.PM.equals(map.get("ampm"))) || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
-                    fee=BigDecimal.ZERO;
+                if(!JZYTZJX.equals(unitCode)){
+                    //非驾驶员体检，周末和节假日挂号费为0，不收挂号费
+                    Calendar cal = Calendar.getInstance();
+                    cal.setTime(requestDayD);
+                    if ((cal.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY && Constants.PM.equals(ampm)) || cal.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+                        fee=BigDecimal.ZERO;
+                    }else {
+                        List<Holidays> holidaysList=holidaysService.queryHolidaysByDate(requestDayD);
+                        if(holidaysList!=null && holidaysList.size()>0){
+                            Holidays holidays = holidaysList.get(0);
+                            //如果开始时间段是上午，那么应该包含下午和全天
+                            List<String> beginAmpms =new ArrayList<>();
+                            beginAmpms.add(holidays.getBeginAmpm());
+                            if(Constants.AM.equals(holidays.getBeginAmpm())){
+                                beginAmpms.add(Constants.PM);
+                                beginAmpms.add(Constants.DAY);
+                            }
+                            //如果结束时间段是下午，那么应该包含上午和全天
+                            List<String> endAmpms =new ArrayList<>();
+                            endAmpms.add(holidays.getEndAmpm());
+                            if(Constants.PM.equals(holidays.getBeginAmpm())){
+                                endAmpms.add(Constants.AM);
+                                endAmpms.add(Constants.DAY);
+                            }
+                            if((holidays.getBeginDate().equals(requestDayD) && beginAmpms.contains(ampm))
+                                    || (holidays.getEndDate().equals(requestDayD) && endAmpms.contains(ampm))
+                                    || (requestDayD.after(holidays.getBeginDate()) && requestDayD.before(holidays.getEndDate()))){
+                                fee=BigDecimal.ZERO;
+                            }
+                        }
+                    }
                 }
                 map.put("fee", fee);
                 map.remove("checkFee");
@@ -1224,7 +1256,6 @@ public class MedicalViewApiController {
                         }
                     }
                 }
-                String ampm = (String) map.get("ampm");
                 if (Constants.AM.equals(ampm)) {
                     ampm = "上午";
                 } else if (Constants.PM.equals(ampm)) {

src/main/java/cn/hnthyy/thmz/entity/thmz/Holidays.java

@@ -0,0 +1,38 @@
+package cn.hnthyy.thmz.entity.thmz;
+
+import cn.hnthyy.thmz.vo.PageParams;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 医技科室档期排班表
+ */
+@Data
+public class Holidays extends PageParams {
+    //主键
+    private Long id;
+    //开始日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date beginDate;
+    //开始日期的上下午
+    private String beginAmpm;
+    //结束日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date endDate;
+    //结束日期的上下午
+    private String endAmpm;
+    //创建人
+    private Long createId;
+    //创建时间
+    private Date createDate;
+    //修改人
+    private Long updateId;
+    //修改时间
+    private Date updateDate;
+
+}

src/main/java/cn/hnthyy/thmz/mapper/thmz/HolidaysMapper.java

@@ -0,0 +1,70 @@
+package cn.hnthyy.thmz.mapper.thmz;
+
+import cn.hnthyy.thmz.entity.thmz.Holidays;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+public interface HolidaysMapper {
+
+    @Insert("insert into t_holidays(begin_date,begin_ampm,end_date,end_ampm,create_id,create_date) values(#{beginDate},#{beginAmpm},#{endDate},#{endAmpm},#{createId,jdbcType=BIGINT},#{createDate,jdbcType=TIMESTAMP})")
+    int insertHolidays(Holidays holidays);
+
+    /**
+     * 删除假期设置
+     *
+     * @param id
+     * @return
+     */
+    @Delete("delete from t_holidays where id=#{id,jdbcType=BIGINT}")
+    int deleteHolidays(@Param("id") Long id);
+
+
+    /**
+     * 分页查询假期
+     *
+     * @param holidays
+     * @return
+     */
+    @Select({"<script>" +
+            "select a.* " +
+            " from t_holidays a join  (" +
+            "select id from t_holidays where 1=1" +
+            " order by id desc limit #{offset},#{pageSize} )b on a.id=b.id"
+            + "</script>"})
+    List<Holidays> selectHolidaysWithPage(Holidays holidays);
+
+    /**
+     * 查询节假日总数
+     *
+     * @param holidays
+     * @return
+     */
+    @Select({"<script>" +
+            "select count(id) from t_holidays where 1=1"
+            + "</script>"})
+    Integer selectCountHolidays(Holidays holidays);
+
+    /**
+     * 按照id查询
+     *
+     * @param id
+     * @return
+     */
+    @Select("select * from t_holidays where id=#{id,jdbcType=BIGINT}")
+    Holidays selectById(@Param("id") Long id);
+
+    /**
+     * 查询大于等于当前给定时间以后的节假日设置
+     * @param beginDate
+     * @return
+     */
+    @Select("select * from t_holidays where #{beginDate}>=begin_date and  #{beginDate}<=end_date")
+    List<Holidays> selectHolidaysByDate(@Param("beginDate") Date beginDate);
+
+
+}

src/main/java/cn/hnthyy/thmz/service/impl/thmz/HolidaysServiceImpl.java

@@ -0,0 +1,46 @@
+package cn.hnthyy.thmz.service.impl.thmz;
+
+import cn.hnthyy.thmz.entity.thmz.Holidays;
+import cn.hnthyy.thmz.mapper.thmz.HolidaysMapper;
+import cn.hnthyy.thmz.service.thmz.HolidaysService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class HolidaysServiceImpl implements HolidaysService {
+    @SuppressWarnings("all")
+    @Autowired
+    private HolidaysMapper holidaysMapper;
+    @Override
+    public int saveHolidays(Holidays holidays) {
+        return holidaysMapper.insertHolidays(holidays);
+    }
+
+    @Override
+    public int removeHolidays(Long id) {
+        return holidaysMapper.deleteHolidays(id);
+    }
+
+    @Override
+    public List<Holidays> queryHolidaysWithPage(Holidays holidays) {
+        return holidaysMapper.selectHolidaysWithPage(holidays);
+    }
+
+    @Override
+    public Integer queryCountHolidays(Holidays holidays) {
+        return holidaysMapper.selectCountHolidays(holidays);
+    }
+
+    @Override
+    public Holidays queryById(Long id) {
+        return holidaysMapper.selectById(id);
+    }
+
+    @Override
+    public List<Holidays> queryHolidaysByDate(Date beginDate) {
+        return holidaysMapper.selectHolidaysByDate(beginDate);
+    }
+}

src/main/java/cn/hnthyy/thmz/service/thmz/HolidaysService.java

@@ -0,0 +1,52 @@
+package cn.hnthyy.thmz.service.thmz;
+
+import cn.hnthyy.thmz.entity.thmz.Holidays;
+
+import java.util.Date;
+import java.util.List;
+
+public interface HolidaysService {
+
+    int saveHolidays(Holidays holidays);
+
+    /**
+     * 删除假期设置
+     *
+     * @param id
+     * @return
+     */
+    int removeHolidays(Long id);
+
+
+    /**
+     * 分页查询假期
+     *
+     * @param holidays
+     * @return
+     */
+    List<Holidays> queryHolidaysWithPage(Holidays holidays);
+
+    /**
+     * 查询节假日总数
+     *
+     * @param holidays
+     * @return
+     */
+    Integer queryCountHolidays(Holidays holidays);
+
+    /**
+     * 按照id查询
+     *
+     * @param id
+     * @return
+     */
+    Holidays queryById(Long id);
+
+
+    /**
+     * 查询大于等于当前给定时间以后的节假日设置
+     * @param beginDate
+     * @return
+     */
+    List<Holidays> queryHolidaysByDate(Date beginDate);
+}

src/main/resources/otherSource/thyy_mz_system.sql

@@ -205,3 +205,24 @@ CREATE TABLE `t_schedule_of_medical`  (
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+-- ----------------------------
+-- Table structure for t_holidays
+-- ----------------------------
+DROP TABLE IF EXISTS `t_holidays`;
+CREATE TABLE `t_holidays`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `begin_date` date NOT NULL COMMENT '开始日期',
+  `begin_ampm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '开始日期的上下午',
+  `end_date` date NOT NULL COMMENT '结束日期',
+  `end_ampm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '结束日期的上下午',
+  `create_id` bigint(20) NOT NULL COMMENT '创建人',
+  `create_date` datetime(0) NOT NULL COMMENT '创建时间',
+  `update_id` bigint(20) DEFAULT NULL COMMENT '修改人',
+  `update_date` datetime(0) DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

src/main/resources/static/js/request-holidays-config.js

@@ -0,0 +1,410 @@
+//@ sourceURL=request-holidays-config.js
+$(function () {
+    $(".selectpicker").selectpicker({
+        dropuAuto: false
+    });
+
+
+    //告警阈值
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getConfigByKey?key=alarm_num',
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            $("#alarmNum").val(res.data.configValue);
+        }
+    });
+
+    $('#send').click(function () {
+        //修改告警设置
+        $.ajax({
+            type: "POST",
+            contentType: "application/json;charset=UTF-8",
+            url: '/thmz/setConfig',
+            dataType: "json",
+            data: JSON.stringify({"configKey": "alarm_num","configValue": $("#alarmNum").val()}),
+            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+            success: function (res) {
+                if (res == '401' || res == 401) {
+                    window.location.href = '/thmz/login/view'
+                    return;
+                }
+                if (res.code == 0) {
+                    //修改告警人员
+                    var doctor=$("#doctor").val();
+                    var doctorStr=null;
+                    if(doctor!=null && doctor.length>0){
+                        for (var i=0;i<doctor.length;i++){
+                            if(doctorStr==null){
+                                doctorStr=doctor[i];
+                            }else {
+                                doctorStr+=","+doctor[i];
+                            }
+
+                        }
+                    }
+                    $.ajax({
+                        type: "POST",
+                        contentType: "application/json;charset=UTF-8",
+                        url: '/thmz/setConfig',
+                        dataType: "json",
+                        data: JSON.stringify({"configKey": "alarm_user","configValue": doctorStr}),
+                        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+                        success: function (res) {
+                            if (res == '401' || res == 401) {
+                                window.location.href = '/thmz/login/view'
+                                return;
+                            }
+                            if (res.code == 0) {
+                                successMesage(res);
+                            } else {
+                                errorMesage(res);
+                            }
+                        }
+                    });
+                } else {
+                    errorMesage(res);
+                }
+            }
+        });
+    });
+
+
+
+
+
+
+    $("#beginDate").change(function (e) {
+        var beginDate = $("#beginDate").val();
+        if (beginDate.length == 8 && beginDate.indexOf("-") <= 0) {
+            beginDate = beginDate.substring(0, 4) + "-" + beginDate.substring(4, 6) + "-" + beginDate.substring(6);
+            $("#beginDate").val(beginDate);
+        }
+        var dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
+        if (!dateFormat.test(beginDate)) {
+            new PNotify({
+                title: '错误提示',
+                text: '开始日期错误',
+                type: 'error',
+                hide: true,
+                styling: 'bootstrap3'
+            });
+        }
+        var arr = beginDate.split("-");
+        if (!checkDate(arr[0], arr[1], arr[2])) {
+            new PNotify({
+                title: '错误提示',
+                text: '开始日期错误',
+                type: 'error',
+                hide: true,
+                styling: 'bootstrap3'
+            });
+        }
+    });
+
+
+    $("#endDate").change(function (e) {
+        var endDate = $("#endDate").val();
+        if (endDate.length == 8 && endDate.indexOf("-") <= 0) {
+            endDate = endDate.substring(0, 4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6);
+            $("#endDate").val(endDate);
+        }
+        var dateFormat = /^(\d{4})-(\d{2})-(\d{2})$/;
+        if (!dateFormat.test(endDate)) {
+            new PNotify({
+                title: '错误提示',
+                text: '结束日期错误',
+                type: 'error',
+                hide: true,
+                styling: 'bootstrap3'
+            });
+        }
+        var arr = endDate.split("-");
+        if (!checkDate(arr[0], arr[1], arr[2])) {
+            new PNotify({
+                title: '错误提示',
+                text: '结束日期错误',
+                type: 'error',
+                hide: true,
+                styling: 'bootstrap3'
+            });
+        }
+    });
+
+
+
+    initMzWorkTime();
+    initList();
+    $("#btn_add").click(function (t) {
+        $("#editModal").modal();
+        clearInput();
+    });
+
+
+    $("#saveEdit").click(function (t) {
+        saveHolidays();
+    });
+});
+
+
+
+
+/**
+ * 保存
+ */
+function saveHolidays() {
+    $.ajax({
+        type: "POST",
+        url: '/thmz/saveHolidays',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        data: JSON.stringify({"beginDate":$("#beginDate").val(),"beginAmpm":$("#beginAmpm").val(),"endDate":$("#endDate").val(),"endAmpm":$("#endAmpm").val()}),
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                $("#editModal").modal("hide");
+                clearInput();
+                $('#tb_table').bootstrapTable('refresh');
+                successMesage(res);
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}
+
+
+
+
+/**
+ * 清空输入框
+ */
+function clearInput() {
+    $("#beginDate").val(null);
+    $('#beginAmpm').selectpicker('val', null);
+    $('#beginAmpm').selectpicker('refresh');
+    $("#endDate").val(null);
+    $('#endAmpm').selectpicker('val', null);
+    $('#endAmpm').selectpicker('refresh');
+}
+
+/**
+ * 查询节假日信息
+ */
+function initList() {
+    $('#tb_table').bootstrapTable("destroy");
+    $('#tb_table').bootstrapTable({
+        url: '/thmz/getHolidays',         //请求后台的URL（*）
+        method: 'post',                      //请求方式（*）
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        pagination: true,                   //是否显示分页（*）
+        sortable: true,                     //是否启用排序
+        sortOrder: "asc",                   //排序方式
+        queryParams: queryParams,           //传递参数（*）
+        sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
+        pageNumber: 1,                       //初始化加载第一页，默认第一页
+        pageSize: 15,                       //每页的记录行数（*）
+        pageList: [10, 15, 25, 50, 100],        //可供选择的每页的行数（*）
+        search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
+        strictSearch: true,
+        showColumns: false,                  //是否显示所有的列
+        showRefresh: false,                  //是否显示刷新按钮
+        minimumCountColumns: 2,             //最少允许的列数
+        clickToSelect: true,                //是否启用点击选中行
+        uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+        showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+        cardView: false,                    //是否显示详细视图
+        detailView: false,
+        //rowStyle:rowStyle,//通过自定义函数设置行样式
+        ajaxOptions: {
+            headers: {
+                'Accept': 'application/json',
+                'Authorization': 'Bearer ' + localStorage.getItem("token")
+            }
+        },
+        columns: [
+            {
+                title: '操作',
+                field: 'op',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    var str='<button type="button" class="btn btn-danger  btn-sm" onclick="removeRequest(' + row.id + ')">删除</button>';
+                    return [str].join('');
+                }
+            },
+            {
+                field: 'beginDate',
+                title: '开始日期',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return format(value, "yyyy-MM-dd");
+                }
+
+            },
+            {
+                field: 'beginAmpm',
+                title: '开始时间段',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    if(value=='a'){
+                        return '<span>上午</span>';
+                    }
+                    if(value=='p'){
+                        return '<span>下午</span>';
+                    }
+                    if(value=='d'){
+                        return '<span>全天</span>';
+                    }
+                }
+            }, {
+                field: 'endDate',
+                title: '结束日期',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return format(value, "yyyy-MM-dd");
+                }
+            }, {
+                field: 'endAmpm',
+                title: '结束时间段',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    if(value=='a'){
+                        return '<span>上午</span>';
+                    }
+                    if(value=='p'){
+                        return '<span>下午</span>';
+                    }
+                    if(value=='d'){
+                        return '<span>全天</span>';
+                    }
+                }
+            }
+        ],
+        onLoadSuccess: function () {
+
+        },
+        responseHandler: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var ress = eval(res);
+            if (ress.code == -1) {
+                if (ress.message != null && ress.message != '') {
+                    new PNotify({
+                        title: '错误提示',
+                        text: ress.message,
+                        type: 'error',
+                        hide: true,
+                        styling: 'bootstrap3'
+                    });
+                }
+                return {
+                    "total": 0,//总页数
+                    "rows": {}   //数据
+                };
+            }
+            return {
+                "total": ress.count,//总页数
+                "rows": ress.data   //数据
+            };
+        },
+    });
+}
+
+/**
+ * 构建列表查询参数
+ * @param params
+ * @returns {{mzChargeDetail: {patientId: string | number | string[] | undefined | jQuery, warnDept: string | number | string[] | undefined | jQuery, doctorCode: string | number | string[] | undefined | jQuery, name: string | number | string[] | undefined | jQuery, payMark: number}, beginTime: Date, endTime: Date, pageSize: *, pageIndex: number}}
+ */
+function queryParams(params) {
+    var temp = {
+        pageSize: params.limit,
+        offset:params.offset,
+    };
+    return temp;
+};
+
+
+/**
+ * 初始门诊时间区间下拉选
+ */
+function initMzWorkTime() {
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getMzWorkTime',
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var html = '';
+            var ampm = null;
+            $.each(res.data, function (commentIndex, comment) {
+                html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+            });
+            $('#beginAmpm').empty();   //清空resText里面的所有内容
+            $('#beginAmpm').html(html);
+            $('#beginAmpm').selectpicker('refresh');
+            $('#endAmpm').empty();   //清空resText里面的所有内容
+            $('#endAmpm').html(html);
+            $('#endAmpm').selectpicker('refresh');
+        }
+    });
+}
+
+
+
+
+
+
+/**
+ * 删除信息
+ * @param id
+ */
+function removeRequest(id) {
+    if (!confirm("确认要删除当前操作的节假日信息吗？")) {
+        return;
+    }
+    $.ajax({
+        type: "GET",
+        url: '/thmz/removeHolidaysById?id=' + id,
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                $('#tb_table').bootstrapTable('refresh');
+                successMesage(res);
+            }else {
+                errorMesage(res);
+            }
+        }
+    });
+}
+
+
+
+
+

src/main/resources/templates/request_holidays_config.html

@@ -0,0 +1,91 @@
+<link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
+<link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
+<link rel="stylesheet" href="/thmz/css/custom.min.css"/>
+<link rel="stylesheet" href="/thmz/css/toll_administration.css"/>
+<script src="/thmz/js/bootstrap-select.js"></script>
+<script src="/thmz/js/request-holidays-config.js"></script>
+<div class="row">
+    <div class="col-md-12 col-sm-12 col-xs-12">
+        <div class="x_panel">
+            <div class="panel-body">
+                <form id="formSearch" class="form-horizontal" autocomplete="off">
+                    <div class="form-group col-md-2 col-sm-2 col-xs-12"></div>
+                    <div class="form-group col-md-10 col-sm-10 col-xs-12">
+                        <div class="col-md-2 col-sm-2 col-xs-12" style="text-align:right;float: right;">
+                            <button type="button" style="margin-left:3px" id="btn_add" class="btn btn-primary"
+                                    title="新增节假日设置"><i class="fa fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="row" style="margin-top: -20px;">
+                <div>
+                    <table id="tb_table"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<!--新增或者编辑号表信息弹窗开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="editModal">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content" style="width: 420px;margin-left: 250px;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title">假日设置【<span id="classTitle">新增</span>】</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate id="editUserForm" autocomplete="off">
+                    <div class="item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="beginDate">开始日期 <span
+                                class="required">*</span>
+                        </label>
+                        <div class="col-md-6 col-sm-6 col-xs-12">
+                            <input type="text" id="beginDate" class="form-control col-md-7 col-xs-12">
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="beginAmpm">开始时间段
+                        </label>
+                        <div class="col-md-6 col-sm-6 col-xs-12">
+                            <select class="form-control selectpicker show-tick" data-live-search="true"
+                                    title="请选择" onchange="initDoctorSelect()"
+                                    id="beginAmpm">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="endDate">结束日期 <span
+                                class="required">*</span>
+                        </label>
+                        <div class="col-md-6 col-sm-6 col-xs-12">
+                            <input type="text" id="endDate" class="form-control col-md-7 col-xs-12">
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="endAmpm">结束时间段
+                        </label>
+                        <div class="col-md-6 col-sm-6 col-xs-12">
+                            <select class="form-control selectpicker show-tick" data-live-search="true"
+                                    title="请选择" onchange="initDoctorSelect()"
+                                    id="endAmpm">
+                            </select>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <input id="requestId" type="hidden"/>
+                <button type="button" class="btn btn-primary" id="saveEdit">保存</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--新增或者编辑号表信息弹窗结尾-->
+
+