jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 210dbc247ec86f944dcf947cba7737b1f95022d4

Authored by zhangchao
1 parent 97f8797127
Exists in dev

#fix:优化大同孕产妇服务管理相关功能

Showing 7 changed files with 99 additions and 15 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java View file @ 210dbc2
... ... @@ -100,7 +100,9 @@
100 100 */
101 101 private Integer isOld;
102 102  
  103 + private Integer renew; //是否为续费 0为否 1为是
103 104  
  105 +
104 106 private Integer device;
105 107 private Integer deviceCon;//'设备条件';
106 108  
... ... @@ -124,6 +126,14 @@
124 126 private Date docStartTime;//'医生开始时间';
125 127  
126 128 private Date docEndTime;//'医生结束时间';
  129 +
  130 + public Integer getRenew() {
  131 + return renew;
  132 + }
  133 +
  134 + public void setRenew(Integer renew) {
  135 + this.renew = renew;
  136 + }
127 137  
128 138 public Integer getDevice() {
129 139 return device;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java View file @ 210dbc2
... ... @@ -103,6 +103,16 @@
103 103 private String serEndStartTime;
104 104 private String serEndCheckTime;
105 105  
  106 + private Integer renew;
  107 +
  108 + public Integer getRenew() {
  109 + return renew;
  110 + }
  111 +
  112 + public void setRenew(Integer renew) {
  113 + this.renew = renew;
  114 + }
  115 +
106 116 public String getSerEndStartTime() {
107 117 return serEndStartTime;
108 118 }
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml View file @ 210dbc2
... ... @@ -26,6 +26,7 @@
26 26 <result column="syn_status" property="synStatus" jdbcType="INTEGER"/>
27 27 <result column="is_old" property="isOld" jdbcType="INTEGER"/>
28 28 <result column="per_type" property="perType" jdbcType="INTEGER"/>
  29 + <result column="renew" property="renew" jdbcType="INTEGER"/>
29 30  
30 31 <result column="device" property="device" jdbcType="INTEGER"/>
31 32 <result column="deviceCon" property="deviceCon" jdbcType="INTEGER"/>
... ... @@ -182,6 +183,9 @@
182 183 <if test="docEndTime != null">
183 184 docEndTime = #{docEndTime,jdbcType=TIMESTAMP},
184 185 </if>
  186 + <if test="renew !=null">
  187 + renew=#{renew,jdbcType=INTEGER},
  188 + </if>
185 189 </set>
186 190 where id = #{id,jdbcType=VARCHAR}
187 191 </update>
... ... @@ -199,7 +203,7 @@
199 203 select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,
200 204 update_date,update_user_name,update_user,hospital_id,ser_code,
201 205 status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type,
202   - doctorWeek,serviceWeek
  206 + doctorWeek,serviceWeek,renew
203 207 from patient_service where id = #{id,jdbcType=VARCHAR}
204 208 </select>
205 209  
... ... @@ -379,6 +383,9 @@
379 383 update_date<= #{updateEndDate}
380 384 ]]>
381 385 </if>
  386 + <if test="renew !=null">
  387 + and renew=#{renew}
  388 + </if>
382 389  
383 390 <if test="sql != null and sql != ''">
384 391 ${sql}
... ... @@ -389,7 +396,7 @@
389 396 <select id="queryPatientService" resultMap="PatientServiceResultMap"
390 397 parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
391 398 select
392   - id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,
  399 + id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,renew,
393 400 hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status,is_old,per_type,
394 401 device,deviceCon,doctorWeek,serviceWeek,serStartWeek,serEndWeek,serStartTime,serEndTime,docStartWeek,docEndWeek,docStartTime,docEndTime
395 402 from patient_service
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java View file @ 210dbc2
... ... @@ -187,6 +187,7 @@
187 187 ps.setSerType(1);
188 188 ps.setSerEndTime(patientService.getSerEndTime());
189 189 ps.setSerStartTime(patientService.getSerStartTime());
  190 + ps.setRenew(1);
190 191 patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor));
191 192  
192 193 }
... ... @@ -200,6 +201,7 @@
200 201 ps.setSerStatus(1);
201 202 ps.setServiceWeek(yxzhVO.getWeeks());
202 203 ps.setSerType(6);
  204 + ps.setRenew(1);
203 205 ps.setSerEndTime(patientService.getSerEndTime());
204 206 ps.setSerStartTime(patientService.getSerStartTime());
205 207 baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor));
... ... @@ -215,6 +217,7 @@
215 217 ps.setSerStatus(1);
216 218 ps.setServiceWeek(yxzhVO.getWeeks());
217 219 ps.setSerType(2);
  220 + ps.setRenew(1);
218 221 ps.setSerEndTime(patientService.getSerEndTime());
219 222 ps.setSerStartTime(patientService.getSerStartTime());
220 223 baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor));
... ... @@ -232,6 +235,7 @@
232 235 ps.setSerStatus(1);
233 236 ps.setServiceWeek(yxzhVO.getWeeks());
234 237 ps.setSerType(20);
  238 + ps.setRenew(1);
235 239 ps.setSerEndTime(patientService.getSerEndTime());
236 240 ps.setSerStartTime(patientService.getSerStartTime());
237 241 baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor));
238 242  
... ... @@ -349,12 +353,14 @@
349 353 @RequestParam(value = "serDoct", required = false) String serDoct,
350 354 @RequestParam(value = "createStartDate", required = false) Date createStartDate,
351 355 @RequestParam(value = "createEndDate", required = false) Date createEndDate,
  356 + @RequestParam(value = "updateStartDate",required =false) Date updateStartDate,
  357 + @RequestParam(value = "updateEndDate",required =false) Date updateEndDate,
352 358 @RequestParam(value = "serStatus", required = false) Integer serStatus,
353 359 BasePageQueryRequest pageInfo,
354 360 HttpServletRequest request
355 361 ) {
356 362 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
357   - return patientServiceFacade.getPatientService(serType,perType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId());
  363 + return patientServiceFacade.getPatientService(serType,perType, serDoct, createStartDate, createEndDate, serStatus, pageInfo, loginState.getId(),updateStartDate,updateEndDate);
358 364 }
359 365  
360 366 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 210dbc2
... ... @@ -1637,8 +1637,9 @@
1637 1637 PatientServiceQuery query=new PatientServiceQuery();
1638 1638 final String hospitalId = "2100002419";
1639 1639 query.setHospitalId(hospitalId);
1640   - query.setPerType(1);
1641   - query.setSerType(1);
  1640 + //query.setPerType(1);
  1641 + Integer []sertypes={1,20};
  1642 + query.setSerTypes(sertypes);
1642 1643 query.setSerStatus(1);
1643 1644 String date= DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),1));
1644 1645 query.setSerEndStartTime(date+" 00:00:00");
1645 1646  
... ... @@ -1661,10 +1662,10 @@
1661 1662 mr.setPatientId(patient.getId());
1662 1663 mr.setSmsStatus(SmsStatusEnums.WFS.getId());
1663 1664 mr.setServiceType(1); //判断发送类型
1664   - mr.setFirst("您好，您购买的产科服务即将到期。");//
  1665 + mr.setFirst("您好，您购买的健康咨询服务即将到期。");//
1665 1666 mr.setObjType(1);
1666 1667 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
1667   - mr.setKeyword1("产科在线咨询服务");//
  1668 + mr.setKeyword1("健康咨询服务");//
1668 1669 //planTime 和 timeType为必填 否则推送中心会推送异常
1669 1670 mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
1670 1671 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
... ... @@ -1676,7 +1677,7 @@
1676 1677 }
1677 1678 }
1678 1679 if (CollectionUtils.isNotEmpty(messages)){
1679   - //smsConfigFacade.saveMsg(messages, hospitalId);
  1680 + smsConfigFacade.saveMsg(messages, hospitalId);
1680 1681 }
1681 1682 }
1682 1683 });
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 210dbc2
... ... @@ -1030,6 +1030,8 @@
1030 1030 result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1031 1031 //高危因素
1032 1032 result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId()));
  1033 + result.setCardNo(patients.getCardNo());
  1034 + result.setVcCardNo(patients.getVcCardNo());
1033 1035  
1034 1036 /* if (!"-".equals(result.getRiskFactor()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
1035 1037 result.setRiskFactor(result.getRiskFactor() + "," + commonService.resloveFactor(patients.getoRiskFactor()));
... ... @@ -1071,7 +1073,7 @@
1071 1073 result.setPid(ps.getPid());
1072 1074 result.setSerType(ps.getSerType());
1073 1075 String serType = PatientSerEnums.SerTypeEnums.getTitle(ps.getSerType());
1074   -
  1076 + result.setRenew(ps.getRenew());
1075 1077 if (ps.getSerType() != null && PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {
1076 1078 serType += getServiceCricle(ps.getParentid());
1077 1079 }
1078 1080  
... ... @@ -1085,9 +1087,9 @@
1085 1087 result.setStatusStr(ps.getStatus() == 1 ? "待领取" : "已领取");
1086 1088 result.setSerCode(ps.getSerCode());
1087 1089 result.setCreateUser(ps.getCreateUser());
1088   - result.setUpdateDate(DateUtil.getyyyy_MM_dd(ps.getUpdateDate()));
  1090 + result.setUpdateDate(DateUtil.getyyyy_MM_dd_hms(ps.getUpdateDate()));
  1091 + result.setSerEndTime(DateUtil.getyyyy_MM_dd(ps.getSerEndTime()));
1089 1092  
1090   -
1091 1093 result.setDevice(ps.getDevice());
1092 1094 result.setDeviceCon(ps.getDeviceCon());
1093 1095 result.setServiceWeek(ps.getServiceWeek());
... ... @@ -1160,7 +1162,8 @@
1160 1162 * @param serStatus 开通状态(1-开通、2-退订、3-过期、4-暂停)
1161 1163 * @return
1162 1164 */
1163   - public BaseListResponse getPatientService(Integer serType, Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus, BasePageQueryRequest pageInfo, Integer id) {
  1165 + public BaseListResponse getPatientService(Integer serType, Integer perType, String serDoct, Date createStartDate, Date createEndDate, Integer serStatus,
  1166 + BasePageQueryRequest pageInfo, Integer id,Date updateStartDate,Date updateEndDate) {
1164 1167 //根据用户id获取医院ID
1165 1168 String hospitalId = autoMatchFacade.getHospitalId(id);
1166 1169 PatientServiceQuery patientQuery = new PatientServiceQuery();
... ... @@ -1175,7 +1178,14 @@
1175 1178 }
1176 1179 patientQuery.setCreateStartDate(createStartDate);
1177 1180 patientQuery.setCreateEndDate(createEndDate);
1178   - patientQuery.setSerStatus(serStatus);
  1181 + patientQuery.setUpdateStartDate(updateStartDate);
  1182 + patientQuery.setUpdateEndDate(updateEndDate);
  1183 + if (serStatus!=null&&6==serStatus){
  1184 + patientQuery.setRenew(1);
  1185 + }else {
  1186 + patientQuery.setSerStatus(serStatus);
  1187 + }
  1188 +
1179 1189 patientQuery.setSort("update_date desc");
1180 1190 patientQuery.setNeed("y");
1181 1191 patientQuery.setOffset((pageInfo.getPage() - 1) * pageInfo.getLimit());
1182 1192  
... ... @@ -1551,13 +1561,13 @@
1551 1561 List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
1552 1562 if (CollectionUtils.isNotEmpty(patientServices)) {
1553 1563 for (PatientService service : patientServices) {
1554   - service.setSerType(1);
  1564 + //service.setSerType(1);
1555 1565 service.setSerStatus(3);
1556 1566 patientServiceService.updatePatientService(service);
1557 1567  
1558 1568 Patients patients = patientsService.findOnePatientById(service.getParentid());
1559 1569 if (patients != null) {
1560   - patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
  1570 + // patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
1561 1571 patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
1562 1572 patientsService.updatePatient(patients);
1563 1573 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java View file @ 210dbc2
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.common.utils.StringUtils;
4 4  
  5 +import java.util.Date;
5 6 import java.util.List;
6 7 import java.util.Map;
7 8  
... ... @@ -124,6 +125,45 @@
124 125 private Integer doctorWeek;//'医生购买周数';
125 126  
126 127 private Integer serviceWeek;//'服务购买周数';
  128 +
  129 + private String cardNo; //身份证号
  130 +
  131 + private String vcCardNo;//就诊卡号
  132 +
  133 + private Integer renew;
  134 + private String serEndTime;//'服务结束时间';
  135 +
  136 + public String getSerEndTime() {
  137 + return serEndTime;
  138 + }
  139 +
  140 + public void setSerEndTime(String serEndTime) {
  141 + this.serEndTime = serEndTime;
  142 + }
  143 +
  144 + public Integer getRenew() {
  145 + return renew;
  146 + }
  147 +
  148 + public void setRenew(Integer renew) {
  149 + this.renew = renew;
  150 + }
  151 +
  152 + public String getCardNo() {
  153 + return cardNo;
  154 + }
  155 +
  156 + public void setCardNo(String cardNo) {
  157 + this.cardNo = cardNo;
  158 + }
  159 +
  160 + public String getVcCardNo() {
  161 + return vcCardNo;
  162 + }
  163 +
  164 + public void setVcCardNo(String vcCardNo) {
  165 + this.vcCardNo = vcCardNo;
  166 + }
127 167  
128 168 public Integer getDevice() {
129 169 return device;