shiyang / regional-platform

Download as
Browse Code »

Commit 03116a38f7f4b7e341153908f5548f63f4085919

Authored by jiangjiazhi
1 parent 83d1716cb8
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 12 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 03116a3
... ... @@ -221,10 +221,17 @@
221 221 if (null != orderModel.getParentId()) {
222 222 Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
223 223 if (null != patients) {
224   - SieveModel sieveModel = patientsService.convertToModel(patients);
225   - sieveModel.setFrom("2");
226   - sieveModel.setHospitalId(orderModel.getHospitalId());
227   - sieveService.addChanQianSieve(sieveModel);
  224 + SieveQuery sieveQuery=new SieveQuery();
  225 + sieveQuery.setYn(YnEnums.YES.getId());
  226 + sieveQuery.setHospitalId(hospitalId);
  227 + sieveQuery.setParentId(patients.getId());
  228 + List<SieveModel> modelList = sieveService.queryList(sieveQuery);
  229 + if(CollectionUtils.isEmpty(modelList)){
  230 + SieveModel sieveModel = patientsService.convertToModel(patients);
  231 + sieveModel.setFrom("2");
  232 + sieveModel.setHospitalId(orderModel.getHospitalId());
  233 + sieveService.addChanQianSieve(sieveModel);
  234 + }
228 235 }
229 236 idList.add(orderModel.getId());
230 237 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 03116a3
... ... @@ -140,7 +140,7 @@
140 140 sieveQuery.setDueWeekStart(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekStart()));
141 141 }
142 142 if(null!=cqSieveQueryRequest.getDueWeekEnd()){
143   - sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()));
  143 + sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd())+6);
144 144 }
145 145 sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx());
146 146 sieveQuery.setIsNotify(cqSieveQueryRequest.getIsNotify());