jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 63e8199588d5c203a34548736ef68d66ee54df2e

Authored by zhangchao
1 parent 2da2c220bb
Exists in luanping

#fix:优化威县预约挂号逻辑

Showing 3 changed files with 17 additions and 13 deletions

platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml View file @ 63e8199
... ... @@ -28,7 +28,7 @@
28 28 where
29 29 1=1
30 30 <if test="doctor!=null">
31   - and doctor=#{doctor}
  31 + and doctor LIKE CONCAT(#{doctor},'%')
32 32 </if>
33 33 <if test="idCard!=null">
34 34 and idCard=#{idCard}
... ... @@ -37,7 +37,7 @@
37 37 and (name like concat('%',#{name},'%') or pinyin like concat('%',#{name},'%'))
38 38 </if>
39 39 <if test="dept!=null">
40   - and (dept like concat(#{dept},'%') or (dept like concat("产后",'%') and dept !='产后服务部'))
  40 + and dept like concat('%',#{dept},'%')
41 41 </if>
42 42 <if test="deptName!=null">
43 43 and dept =#{deptName}
... ... @@ -52,7 +52,7 @@
52 52 where
53 53 1=1
54 54 <if test="doctor!=null">
55   - and doctor=#{doctor}
  55 + and doctor LIKE CONCAT(#{doctor},'%')
56 56 </if>
57 57 <if test="idCard!=null">
58 58 and idCard=#{idCard}
... ... @@ -61,7 +61,7 @@
61 61 and (name like concat('%',#{name},'%') or pinyin like concat('%',#{name},'%'))
62 62 </if>
63 63 <if test="dept!=null">
64   - and (dept like concat(#{dept},'%') or (dept like concat("产后",'%') and dept !='产后服务部'))
  64 + and dept like concat('%',#{dept},'%')
65 65 </if>
66 66 and <![CDATA[checkTime>=#{startTime}]]>
67 67 and <![CDATA[checkTime<=#{endTime}]]>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWxController.java View file @ 63e8199
... ... @@ -667,10 +667,12 @@
667 667 String need=null;
668 668 if (doctors.contains(doctor)){
669 669 doctor=doctorName;
670   - dept="产科";
  670 + dept="产";
671 671 if (isBuild==null && expire==null){
672 672 need="true";
673 673 }
  674 + }else {
  675 + return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常");
674 676 }
675 677 AppointmentQuery appointmentQuery=new AppointmentQuery();
676 678 appointmentQuery.setDoctor(doctor);
... ... @@ -824,7 +826,9 @@
824 826 endTime=endTime+" 23:59:59";
825 827 String dept=null;
826 828 if (doctors.contains(doctor)){
827   - dept="产科";
  829 + dept="产";
  830 + }else {
  831 + return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常");
828 832 }
829 833 //只有护士长和主任可以看统计（目前）
830 834 /* if (doctor.equals("田保来")||doctor.equals("孙慧洁")){
831 835  
... ... @@ -946,9 +950,9 @@
946 950 endTime=endTime+" 23:59:59";
947 951 String dept=null;
948 952 //只有护士长和主任可以看统计（目前）
949   - if (doctor.equals("田保来")||doctor.equals("孙慧洁")){
  953 + if (doctor.equals("牛向静")){
950 954 if (StringUtils.isEmpty(deptName)){
951   - dept="产科";
  955 + dept="产";
952 956 }
953 957 }else {
954 958 return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常");
... ... @@ -1028,8 +1032,8 @@
1028 1032 if (authorization.contains(Authorization)){
1029 1033 String doctor= appointmentExport.getDoctor();
1030 1034 String dept=null;
1031   - if (doctor.equals("田保来")||doctor.equals("孙慧洁")){
1032   - dept="产科";
  1035 + if (doctor.equals("牛向静")){
  1036 + dept="产";
1033 1037 }else {
1034 1038 return;
1035 1039 }
... ... @@ -1175,7 +1179,7 @@
1175 1179 throw new RuntimeException("权限异常");
1176 1180 }
1177 1181 if (doctors.contains(doctor)){
1178   - doctor="孙慧洁";
  1182 + doctor="牛向静";
1179 1183 }
1180 1184 patientFacade.reportAppointmentList(response,doctor,startTime,endTime,name,doctorName);
1181 1185 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 63e8199
... ... @@ -3718,8 +3718,8 @@
3718 3718 cnames.put("科室", "科室");
3719 3719 cnames.put("预约时间", "预约时间");
3720 3720 String dept=null;
3721   - if ("孙慧洁".equals(doctor)){
3722   - dept="产科";
  3721 + if ("牛向静".equals(doctor)){
  3722 + dept="产";
3723 3723 doctor=doctorName;
3724 3724 }
3725 3725 AppointmentQuery appointmentQuery=new AppointmentQuery();