下午号段增加5点到5点半

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

@@ -1870,6 +1870,7 @@ public class MedicalViewApiController {
                     map.remove("p4");
                     map.remove("p5");
                     map.remove("p6");
+                    map.remove("p7");
                 }else  if(Constants.PM.equals(ampm)){
                     map.remove("a1");
                     map.remove("a2");
@@ -1894,6 +1895,7 @@ public class MedicalViewApiController {
                     map.remove("p4");
                     map.remove("p5");
                     map.remove("p6");
+                    map.remove("p7");
                 }
                 MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(ampm);
                 if (mzZdWorkTime == null) {

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

@@ -504,7 +504,8 @@ public class MzyRequestController {
                         mrc.setP4(num);
                         mrc.setP5(num);
                         mrc.setP6(num);
-                        mrc.setLeftNum(num*6);
+                        mrc.setP7(num);
+                        mrc.setLeftNum(num*7);
                         mrc.setTotalNum(mrc.getLeftNum());
                     }
                     newMzyRequest.add(mrc);
@@ -678,37 +679,43 @@ public class MzyRequestController {
             } else if (Constants.PM.equals(m.getAmpm())) {
                 Long aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 14:30").getTime();
                 if (currentLong <= aLong) {
-                    Integer leftNum = m.getP1() + m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6();
+                    Integer leftNum = m.getP1() + m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6() + m.getP7();
                     m.setLeftNum(leftNum);
                     continue;
                 }
                 aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 15:00").getTime();
                 if (currentLong <= aLong) {
-                    Integer leftNum = m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6();
+                    Integer leftNum = m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6() + m.getP7();
                     m.setLeftNum(leftNum);
                     continue;
                 }
                 aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 15:30").getTime();
                 if (currentLong <= aLong) {
-                    Integer leftNum = m.getP3() + m.getP4() + m.getP5() + m.getP6();
+                    Integer leftNum = m.getP3() + m.getP4() + m.getP5() + m.getP6() + m.getP7();
                     m.setLeftNum(leftNum);
                     continue;
                 }
                 aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 16:00").getTime();
                 if (currentLong <= aLong) {
-                    Integer leftNum = m.getP4() + m.getP5() + m.getP6();
+                    Integer leftNum = m.getP4() + m.getP5() + m.getP6() + m.getP7();
                     m.setLeftNum(leftNum);
                     continue;
                 }
                 aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 16:30").getTime();
                 if (currentLong <= aLong) {
-                    Integer leftNum = m.getP5() + m.getP6();
+                    Integer leftNum = m.getP5() + m.getP6() + m.getP7();
                     m.setLeftNum(leftNum);
                     continue;
                 }
                 aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 17:00").getTime();
                 if (currentLong <= aLong) {
-                    Integer leftNum = m.getP6();
+                    Integer leftNum = m.getP6() + m.getP7();
+                    m.setLeftNum(leftNum);
+                    continue;
+                }
+                aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 17:30").getTime();
+                if (currentLong <= aLong) {
+                    Integer leftNum = m.getP7();
                     m.setLeftNum(leftNum);
                     continue;
                 }

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

@@ -211,6 +211,9 @@ public class MzyReqrec implements Serializable {
         if ("p6".equals(apTime)) {
             return DateUtil.pase(dateTime + " 16:30:00", "yyyy-MM-dd HH:mm:ss");
         }
+        if ("p7".equals(apTime)) {
+            return DateUtil.pase(dateTime + " 17:00:00", "yyyy-MM-dd HH:mm:ss");
+        }
         return requestDay;
     }
 }

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

@@ -100,6 +100,8 @@ public class MzyRequest implements Serializable{
     private Integer p5;
     //时间分段16:30-17:00 号数
     private Integer p6;
+    //时间分段17:00-17:30 号数
+    private Integer p7;
 
     /**
      * 设置排班号码
@@ -120,5 +122,6 @@ public class MzyRequest implements Serializable{
         this.p4=num;
         this.p5=num;
         this.p6=num;
+        this.p7=num;
     }
 }

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

@@ -14,7 +14,7 @@ public interface MzyRequestMapper {
      * @param requestDay
      * @return
      */
-    @Select(" select id,request_day,rtrim(ampm) ampm,rtrim(unit_code) unit_code,group_code,rtrim(doctor_code) doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num from mzy_request_new WITH(NOLOCK) where request_day = #{requestDay,jdbcType=DATE}")
+    @Select(" select id,request_day,rtrim(ampm) ampm,rtrim(unit_code) unit_code,group_code,rtrim(doctor_code) doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num from mzy_request_new WITH(NOLOCK) where request_day = #{requestDay,jdbcType=DATE}")
     List<MzyRequest> selectMzyRequestByRequestDay(@Param("requestDay") String requestDay);
 
 
@@ -62,7 +62,7 @@ public interface MzyRequestMapper {
      * @return
      */
     @Select({"<script>",
-            "select id,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,check_fee,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num,rtrim(ampm) ampm from mzy_request_new WITH(NOLOCK) where ",
+            "select id,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,check_fee,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num,rtrim(ampm) ampm from mzy_request_new WITH(NOLOCK) where ",
             " request_day = #{requestDay,jdbcType=DATE} and unit_code=#{unitCode,jdbcType=CHAR} ",
             "<when test='ampm!=null'>",
             " and ampm =#{ampm,jdbcType=CHAR} ",
@@ -116,7 +116,7 @@ public interface MzyRequestMapper {
      *
      * @param id 主键
      */
-    @Select(" select id,request_day,rtrim(ampm) ampm,rtrim(unit_code) unit_code,group_code,rtrim(doctor_code) doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num" +
+    @Select(" select id,request_day,rtrim(ampm) ampm,rtrim(unit_code) unit_code,group_code,rtrim(doctor_code) doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num" +
             " from mzy_request_new WITH(NOLOCK) where id = #{id,jdbcType=BIGINT}")
     MzyRequest selectMzyRequestById(@Param("id") Long id);
 
@@ -143,7 +143,7 @@ public interface MzyRequestMapper {
      * @param mzyRequest
      * @return
      */
-    @Update("update mzy_request_new set left_num=#{leftNum},bespeak_no=#{bespeakNo,jdbcType=SMALLINT},a1=#{a1},a2=#{a2},a3=#{a3},a4=#{a4},a5=#{a5},a6=#{a6},a7=#{a7},a8=#{a8},p1=#{p1},p2=#{p2},p3=#{p3},p4=#{p4},p5=#{p5},p6=#{p6} where id = #{id,jdbcType=BIGINT}")
+    @Update("update mzy_request_new set left_num=#{leftNum},bespeak_no=#{bespeakNo,jdbcType=SMALLINT},a1=#{a1},a2=#{a2},a3=#{a3},a4=#{a4},a5=#{a5},a6=#{a6},a7=#{a7},a8=#{a8},p1=#{p1},p2=#{p2},p3=#{p3},p4=#{p4},p5=#{p5},p6=#{p6},p7=#{p7} where id = #{id,jdbcType=BIGINT}")
     int updateMzyRequest(MzyRequest mzyRequest);
 
 
@@ -173,7 +173,7 @@ public interface MzyRequestMapper {
      *
      * @return
      */
-    @Select("select request_day,rtrim(ampm) ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num " +
+    @Select("select request_day,rtrim(ampm) ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num " +
             " from mzy_request WITH(NOLOCK) where request_day =#{today,jdbcType=DATE}")
     List<MzyRequest> selectRequestForToday(Date today);
 
@@ -183,7 +183,7 @@ public interface MzyRequestMapper {
      * @param mzyRequest
      * @return
      */
-    @Select("select request_day,rtrim(ampm) ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num from mzy_request_new WITH(NOLOCK) where  ampm = #{ampm} and unit_code = #{unitCode}  and request_day = #{requestDay,jdbcType=DATE} and doctor_code =#{doctorCode} and charge_type =#{chargeType}  ")
+    @Select("select request_day,rtrim(ampm) ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num from mzy_request_new WITH(NOLOCK) where  ampm = #{ampm} and unit_code = #{unitCode}  and request_day = #{requestDay,jdbcType=DATE} and doctor_code =#{doctorCode} and charge_type =#{chargeType}  ")
     MzyRequest selectMzyRequestByAllParams(MzyRequest mzyRequest);
 
     /**
@@ -192,8 +192,8 @@ public interface MzyRequestMapper {
      * @return
      */
     @Insert("if not exists (select id  from mzy_request_new where request_day=#{requestDay,jdbcType=DATE} and ampm = #{ampm,jdbcType=CHAR} and unit_code=#{unitCode} and group_code=#{groupCode} and charge_type=#{chargeType} and doctor_code=#{doctorCode} ) " +
-            "insert into mzy_request_new(request_day,ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num) " +
-            "values(#{requestDay,jdbcType=DATE},#{ampm},#{unitCode},#{groupCode},#{doctorCode},#{chargeType},#{opId},#{bespeakNo},#{checkFee},#{sysDate,jdbcType=DATE},#{delFlag},#{a1},#{a2},#{a3},#{a4},#{a5},#{a6},#{a7},#{a8},#{p1},#{p2},#{p3},#{p4},#{p5},#{p6},#{totalNum},#{leftNum})")
+            "insert into mzy_request_new(request_day,ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num) " +
+            "values(#{requestDay,jdbcType=DATE},#{ampm},#{unitCode},#{groupCode},#{doctorCode},#{chargeType},#{opId},#{bespeakNo},#{checkFee},#{sysDate,jdbcType=DATE},#{delFlag},#{a1},#{a2},#{a3},#{a4},#{a5},#{a6},#{a7},#{a8},#{p1},#{p2},#{p3},#{p4},#{p5},#{p6},#{p7},#{totalNum},#{leftNum})")
     int insertRequest(MzyRequest mzyRequest);
 
 
@@ -206,7 +206,7 @@ public interface MzyRequestMapper {
      * @return
      */
     @Select({"<script>",
-            "select request_day,rtrim(ampm) ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,total_num,left_num from mzy_request_new WITH(NOLOCK) where request_day = #{requestDay,jdbcType=DATE} and unit_code=#{unitCode,jdbcType=CHAR} and ampm =#{ampm,jdbcType=CHAR}  and charge_type=#{chargeType} ",
+            "select request_day,rtrim(ampm) ampm,unit_code,group_code,doctor_code,charge_type,op_id,bespeak_no,check_fee,sys_date,del_flag,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7,total_num,left_num from mzy_request_new WITH(NOLOCK) where request_day = #{requestDay,jdbcType=DATE} and unit_code=#{unitCode,jdbcType=CHAR} and ampm =#{ampm,jdbcType=CHAR}  and charge_type=#{chargeType} ",
             "<when test='doctorCode!=null'>",
             " and doctor_code=#{doctorCode} ",
             "</when>",
@@ -250,7 +250,7 @@ public interface MzyRequestMapper {
      * @return
      */
     @Select({"<script>",
-            "  SELECT id,request_day,rtrim(ampm) ampm ,unit_code,group_code,doctor_code,charge_type,total_num,op_id,left_num,check_fee,bespeak_no,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6 " +
+            "  SELECT id,request_day,rtrim(ampm) ampm ,unit_code,group_code,doctor_code,charge_type,total_num,op_id,left_num,check_fee,bespeak_no,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7 " +
                     "    FROM mzy_request_new WITH(NOLOCK) " +
                     " where " +
                     "         request_day <![CDATA[>=]]> #{beginDate,jdbcType=TIMESTAMP} and " +
@@ -274,7 +274,7 @@ public interface MzyRequestMapper {
      */
     @Update("if not exists (select id  from mzy_request_new where request_day=#{requestDay,jdbcType=DATE} and ampm = #{ampm,jdbcType=CHAR} and unit_code=#{unitCode} and group_code=#{groupCode} and charge_type=#{chargeType} and doctor_code=#{doctorCode} and id <> #{id,jdbcType=BIGINT} ) " +
             "update mzy_request_new set request_day=#{requestDay,jdbcType=DATE},ampm=#{ampm},unit_code=#{unitCode},doctor_code=#{doctorCode},charge_type=#{chargeType},total_num=#{totalNum},left_num=#{leftNum,jdbcType=INTEGER}," +
-            " bespeak_no=#{bespeakNo,jdbcType=SMALLINT},check_fee=#{checkFee},a1=#{a1},a2=#{a2},a3=#{a3},a4=#{a4},a5=#{a5},a6=#{a6},a7=#{a7},a8=#{a8},p1=#{p1},p2=#{p2},p3=#{p3},p4=#{p4},p5=#{p5},p6=#{p6} where id = #{id,jdbcType=BIGINT}")
+            " bespeak_no=#{bespeakNo,jdbcType=SMALLINT},check_fee=#{checkFee},a1=#{a1},a2=#{a2},a3=#{a3},a4=#{a4},a5=#{a5},a6=#{a6},a7=#{a7},a8=#{a8},p1=#{p1},p2=#{p2},p3=#{p3},p4=#{p4},p5=#{p5},p6=#{p6},p7=#{p7} where id = #{id,jdbcType=BIGINT}")
     int updateMzyRequestNew(MzyRequest mzyRequest);
 
 
@@ -336,7 +336,7 @@ public interface MzyRequestMapper {
      * @return
      */
     @Select({"<script>",
-            "select id mzyRequestId,rtrim(ampm) ampm,doctor_code doctorCode,charge_type chargeType,check_fee checkFee,left_num leftNum,total_num totalNum,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6 from mzy_request_new WITH(NOLOCK) where unit_code=#{unitCode} and request_day=#{requestDay,jdbcType=TIMESTAMP} and doctor_code  =#{doctorCode} and del_flag=0  and charge_type not in (16,24)",
+            "select id mzyRequestId,rtrim(ampm) ampm,doctor_code doctorCode,charge_type chargeType,check_fee checkFee,left_num leftNum,total_num totalNum,a1,a2,a3,a4,a5,a6,a7,a8,p1,p2,p3,p4,p5,p6,p7 from mzy_request_new WITH(NOLOCK) where unit_code=#{unitCode} and request_day=#{requestDay,jdbcType=TIMESTAMP} and doctor_code  =#{doctorCode} and del_flag=0  and charge_type not in (16,24)",
             "<when test='ampms!=null'>",
             " and ampm  not in ",
             "<foreach item='item' index='index' collection='ampms' open='(' separator=',' close=')'>",

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

@@ -211,6 +211,9 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
             if ("p6".equals(mzyReqrec.getApTime()) && mzyRequest.getP6() <= 0) {
                 throw new MzException("当前预约时间段已满，请更换其他号段！");
             }
+            if ("p7".equals(mzyReqrec.getApTime()) && mzyRequest.getP7() <= 0) {
+                throw new MzException("当前预约时间段已满，请更换其他号段！");
+            }
             mzyReqrec.setRequestDay(mzyReqrec.getFullApTime(mzyRequest.getRequestDay(), mzyReqrec.getApTime()));
         }
         int times = getTimes(mzPatientMi);
@@ -673,6 +676,8 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
                     } else {
                         apTime = "p6";
                     }
+                }else if ("17".equals(requestHour)) {
+                        apTime = "p7";
                 }
                 mzyRequestMapper.updateLeftNumById(reqrecRequestRelation.getRequestId(), apTime);
                 MzyRequest dbMzyRequest = mzyRequestMapper.selectMzyRequestById(reqrecRequestRelation.getRequestId());

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

@@ -155,6 +155,8 @@ public class MzyRequestServiceImpl implements MzyRequestService {
                 mzyRequest.setP5(mzyRequest.getP5() - 1);
             } else if ("p6".equals(apTime)) {
                 mzyRequest.setP6(mzyRequest.getP6() - 1);
+            }else if ("p7".equals(apTime)) {
+                mzyRequest.setP7(mzyRequest.getP7() - 1);
             }
         }
         newLeftNum=getApLeftNum(mzyRequest);
@@ -228,34 +230,40 @@ public class MzyRequestServiceImpl implements MzyRequestService {
         if (Constants.PM.equals(m.getAmpm())){
             Long aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 14:30").getTime();
             if (currentLong <= aLong) {
-                Integer leftNum = m.getP1() + m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6();
+                Integer leftNum = m.getP1() + m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6() + m.getP7();
                 return leftNum;
             }
             aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 15:00").getTime();
             if (currentLong <= aLong) {
-                Integer leftNum = m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6();
+                Integer leftNum = m.getP2() + m.getP3() + m.getP4() + m.getP5() + m.getP6() + m.getP7();
                 return leftNum;
             }
             aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 15:30").getTime();
             if (currentLong <= aLong) {
-                Integer leftNum = m.getP3() + m.getP4() + m.getP5() + m.getP6();
+                Integer leftNum = m.getP3() + m.getP4() + m.getP5() + m.getP6() + m.getP7();
                 return leftNum;
             }
             aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 16:00").getTime();
             if (currentLong <= aLong) {
-                Integer leftNum = m.getP4() + m.getP5() + m.getP6();
+                Integer leftNum = m.getP4() + m.getP5() + m.getP6() + m.getP7();
                 return leftNum;
             }
             aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 16:30").getTime();
             if (currentLong <= aLong) {
-                Integer leftNum = m.getP5() + m.getP6();
+                Integer leftNum = m.getP5() + m.getP6() + m.getP7();
                 return leftNum;
             }
             aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 17:00").getTime();
             if (currentLong <= aLong) {
-                Integer leftNum = m.getP6();
+                Integer leftNum = m.getP6() + m.getP7();
                 return leftNum;
             }
+            aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 17:30").getTime();
+            if (currentLong <= aLong) {
+                Integer leftNum = m.getP7();
+                return leftNum;
+            }
+
             return 0;
         }
         return m.getLeftNum();
@@ -326,6 +334,10 @@ public class MzyRequestServiceImpl implements MzyRequestService {
             if (currentLong <= aLong) {
                 return "p6";
             }
+            aLong = simpleDateFormat.parse(DateUtil.fomart(m.getRequestDay(), "yyyy-MM-dd") + " 17:30").getTime();
+            if (currentLong <= aLong) {
+                return "p7";
+            }
             return null;
         }
         return null;
@@ -381,6 +393,8 @@ public class MzyRequestServiceImpl implements MzyRequestService {
                 leftNum = mzyRequest.getP5();
             } else if ("p6".equals(apTime)) {
                 leftNum = mzyRequest.getP6();
+            } else if ("p7".equals(apTime)) {
+                leftNum = mzyRequest.getP7();
             }
             mzyRequest.setLeftNum(leftNum);
         }

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

@@ -13208,22 +13208,25 @@ function setAmTimes(ampm) {
         } else {
             if (afterToday || range(paseToFullTime("00:00"), paseToFullTime("14:30"))) {
                 defaultTime = "p1";
-                timeHtml = '<option value="p1">14:00-14:30</option><option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p1">14:00-14:30</option><option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("14:30"), paseToFullTime("15:00"))) {
                 defaultTime = "p2";
-                timeHtml = '<option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("15:00"), paseToFullTime("15:30"))) {
                 defaultTime = "p3";
-                timeHtml = '<option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("15:30"), paseToFullTime("16:00"))) {
                 defaultTime = "p4";
-                timeHtml = '<option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("16:00"), paseToFullTime("16:30"))) {
                 defaultTime = "p5";
-                timeHtml = '<option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("16:30"), paseToFullTime("17:00"))) {
                 defaultTime = "p6";
-                timeHtml = '<option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
+            }else if (range(paseToFullTime("17:00"), paseToFullTime("17:30"))) {
+                defaultTime = "p7";
+                timeHtml = '<option value="p7">17:00-17:30</option>';
             }
         }
         $('#apTimes').html(timeHtml);

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

@@ -559,22 +559,25 @@ function setAmTimes(ampm) {
         } else {
             if (range(paseToFullTime("00:00"), paseToFullTime("14:30"))) {
                 defaultTime = "p1";
-                timeHtml = '<option value="p1">14:00-14:30</option><option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p1">14:00-14:30</option><option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("14:30"), paseToFullTime("15:00"))) {
                 defaultTime = "p2";
-                timeHtml = '<option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p2">14:30-15:00</option><option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("15:00"), paseToFullTime("15:30"))) {
                 defaultTime = "p3";
-                timeHtml = '<option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p3">15:00-15:30</option><option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("15:30"), paseToFullTime("16:00"))) {
                 defaultTime = "p4";
-                timeHtml = '<option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p4">15:30-16:00</option><option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("16:00"), paseToFullTime("16:30"))) {
                 defaultTime = "p5";
-                timeHtml = '<option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p5">16:00-16:30</option><option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
             } else if (range(paseToFullTime("16:30"), paseToFullTime("17:00"))) {
                 defaultTime = "p6";
-                timeHtml = '<option value="p6">16:30-17:00</option>';
+                timeHtml = '<option value="p6">16:30-17:00</option><option value="p7">17:00-17:30</option>';
+            }else if (range(paseToFullTime("17:00"), paseToFullTime("17:30"))) {
+                defaultTime = "p7";
+                timeHtml = '<option value="p7">17:00-17:30</option>';
             }
         }
         $('#apTimes').html(timeHtml);

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

@@ -167,6 +167,7 @@ function clearInput() {
     $("#p4").val(null);
     $("#p5").val(null);
     $("#p6").val(null);
+    $("#p7").val(null);
 }
 
 
@@ -634,7 +635,7 @@ function cleanParams() {
 function saveTempRequest() {
     var index = $("#requestId").val();
     var realParams = JSON.parse('{"mzyRequests":""}');
-    var tempJson = JSON.parse('{"requestDay":"","ampm":"","unitCode":"","doctorCode":"","chargeType":"","totalNum":"","leftNum":"","bespeakNo":"1","checkFee":"","a1":"","a2":"","a3":"","a4":"","a5":"","a6":"","a7":"","a8":"","p1":"","p2":"","p3":"","p4":"","p5":"","p6":""}');
+    var tempJson = JSON.parse('{"requestDay":"","ampm":"","unitCode":"","doctorCode":"","chargeType":"","totalNum":"","leftNum":"","bespeakNo":"1","checkFee":"","a1":"","a2":"","a3":"","a4":"","a5":"","a6":"","a7":"","a8":"","p1":"","p2":"","p3":"","p4":"","p5":"","p6":"","p7":""}');
     tempJson.requestDay = $("#editDay").val();
     tempJson.ampm = $("#ampm").val();
     tempJson.unitCode = $("#deptNo").val();
@@ -658,6 +659,7 @@ function saveTempRequest() {
     tempJson.p4 = $("#p4").val();
     tempJson.p5 = $("#p5").val();
     tempJson.p6 = $("#p6").val();
+    tempJson.p7 = $("#p7").val();
 
     if (index == null || index == "") {
         tempData[tempData.length] = tempJson;
@@ -680,7 +682,7 @@ function saveRequest() {
         var realParams = JSON.parse('{"mzyRequests":[]}');
         for (var i = 0; i < tempData.length; i++) {
             var thisData = tempData[i];
-            var tempJson = JSON.parse('{"requestDay":"","ampm":"","unitCode":"","doctorCode":"","chargeType":"","totalNum":"","leftNum":"","bespeakNo":"1","checkFee":"","a1":"","a2":"","a3":"","a4":"","a5":"","a6":"","a7":"","a8":"","p1":"","p2":"","p3":"","p4":"","p5":"","p6":""}');
+            var tempJson = JSON.parse('{"requestDay":"","ampm":"","unitCode":"","doctorCode":"","chargeType":"","totalNum":"","leftNum":"","bespeakNo":"1","checkFee":"","a1":"","a2":"","a3":"","a4":"","a5":"","a6":"","a7":"","a8":"","p1":"","p2":"","p3":"","p4":"","p5":"","p6":"","p7":""}');
             tempJson.requestDay = thisData.requestDay;
             tempJson.ampm = thisData.ampm;
             tempJson.unitCode = thisData.unitCode;
@@ -704,6 +706,7 @@ function saveRequest() {
             tempJson.p4 = thisData.p4;
             tempJson.p5 = thisData.p5;
             tempJson.p6 = thisData.p6;
+            tempJson.p7 = thisData.p7;
             realParams.mzyRequests[i] = tempJson;
         }
         data = JSON.stringify(realParams);
@@ -733,7 +736,8 @@ function saveRequest() {
                 p3: $("#p3").val(),
                 p4: $("#p4").val(),
                 p5: $("#p5").val(),
-                p6: $("#p6").val()
+                p6: $("#p6").val(),
+                p7: $("#p7").val()
             }]
         });
     }
@@ -936,6 +940,7 @@ function updateRequest(id) {
                 $("#p4").val(res.data.p4);
                 $("#p5").val(res.data.p5);
                 $("#p6").val(res.data.p6);
+                $("#p7").val(res.data.p7);
                 $("#editModal").modal();
             }
         }
@@ -1052,6 +1057,7 @@ function needSetTotalNum() {
                 $("#p4").val(unitNum);
                 $("#p5").val(unitNum);
                 $("#p6").val(unitNum);
+                $("#p7").val(unitNum);
             }
         }
     }

src/main/resources/templates/mz/request.html

@@ -324,6 +324,16 @@
                                    placeholder="请输入">
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert hide pTime">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="p7">17:00-17:30 <span
+                                class="required">*</span>
+                        </label>
+                        <div class="col-md-6 col-sm-6 col-xs-12">
+                            <input id="p7" class="form-control optional" type="number"
+                                   data-validate-length-range="0,10"
+                                   placeholder="请输入">
+                        </div>
+                    </div>
                 </form>
             </div>
             <div class="modal-footer">