Commit ee2118e3b3e31e5445aa03d0b6525434d71db306

Authored by jiangjiazhi
1 parent 6b5b26f4c6

修改新电子病历

Showing 1 changed file with 11 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ ee2118e
... ... @@ -143,11 +143,11 @@
143 143 patients.setExpVip(0);
144 144 id = patientsService.addPatient(patients).getId();
145 145 } else {
146   - id = patientsList.get(0).getId();
  146 + Patients patients1 = patientsList.get(0);
  147 + id = patients1.getId();
  148 + patients1.setBuildType(3);
  149 + patientsService.updatePatient(patients1);
147 150 }
148   - } else {
149   - patients.setBuildType(3);
150   - patientsService.updatePatient(patients);
151 151 }
152 152 }
153 153 } else {
... ... @@ -178,7 +178,7 @@
178 178 babyModelQuery.setPid(babyModel.getPid());
179 179 babyModelQuery.setHospitalId(referralApplyOrderModel.getTransferredHospital());
180 180 babyModelQuery.setYn(YnEnums.YES.getId());
181   - List<BabyModel> babyModels =babyService.queryBabyWithQuery(babyModelQuery);
  181 + List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
182 182 //没有儿童档案的时候才建档
183 183 if (CollectionUtils.isEmpty(babyModels)) {
184 184 ////在转入的医院新增儿童建档
185 185  
... ... @@ -191,12 +191,13 @@
191 191 babyModel.setExpVip(0);
192 192 babyModel.setBuildType(3);
193 193 id = babyService.addOneBaby(babyModel).getId();
194   - }else{
195   - id=babyModels.get(0).getId();
  194 + } else {
  195 + BabyModel babyModel1 = babyModels.get(0);
  196 + id = babyModel1.getId();
  197 + babyModel1.setModified(new Date());
  198 + babyModel1.setBuildType(3);
  199 + babyService.updateOneBaby(babyModel1, babyModel1.getId());
196 200 }
197   - } else {
198   - babyModel.setBuildType(3);
199   - babyService.updateOneBaby(babyModel, babyModel.getId());
200 201 }
201 202 }
202 203 }