fangcheng / regional-platform

Download as
Browse Code »

Commit 6af85732b795a93095f8c552186b3ed71eeed6a5

Authored by jiangjiazhi
1 parent 13b97b96bf
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 54 additions and 39 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 6af8573
... ... @@ -55,7 +55,7 @@
55 55  
56 56 private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
57 57  
58   - private static Map<String, List> babyMap = new HashMap<>();
  58 + private static Map<String, List> babyMap = new HashMap<>();
59 59  
60 60 static {
61 61 ONE_ENUMS.put(0, "长");
... ... @@ -133,7 +133,7 @@
133 133 if (null != deliverAddRequest.getDueDate()) {
134 134 Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
135 135 //修改分娩日期
136   - updatePatientFmDate(patients1.getPid(),fmDate,1);
  136 + updatePatientFmDate(patients1.getPid(), fmDate, 1);
137 137 //修改person表状态为产妇
138 138 if (StringUtils.isNotEmpty(patients1.getPid())) {
139 139 PersonModel personModel = new PersonModel();
... ... @@ -152,7 +152,7 @@
152 152 babyModelQuery.setBirthEnd(patients1.getFmDate());
153 153 List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
154 154 if (CollectionUtils.isEmpty(babyModels)) {
155   - handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1,hospitalId);
  155 + handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId);
156 156 } else {
157 157 List<MaternalDeliverModel.Baby> babies = new ArrayList<>();
158 158 for (BabyModel babyModel : babyModels) {
... ... @@ -195,7 +195,7 @@
195 195 patientsQuery.setId(deliverAddRequest.getParentId());
196 196 Patients patients = patientsService.findOnePatientById(deliverAddRequest.getParentId());
197 197 //修改分娩日期
198   - updatePatientFmDate(patients.getPid(),fmDate,3);
  198 + updatePatientFmDate(patients.getPid(), fmDate, 3);
199 199 /* if (CollectionUtils.isNotEmpty(patients)) {
200 200 if(fmDate.after(DateUtil.addDay(patients.get(0).getLastMenses(),168))){
201 201 Patients patients2=new Patients();
202 202  
203 203  
204 204  
... ... @@ -217,19 +217,20 @@
217 217  
218 218 /**
219 219 * 修改建档记录的分娩时间和
  220 + *
220 221 * @param pid
221 222 * @param fmDate
222 223 */
223   - private void updatePatientFmDate(String pid,Date fmDate,int type){
224   - PatientsQuery patientsQuery=new PatientsQuery();
  224 + private void updatePatientFmDate(String pid, Date fmDate, int type) {
  225 + PatientsQuery patientsQuery = new PatientsQuery();
225 226 patientsQuery.setPid(pid);
226 227 patientsQuery.setYn(YnEnums.YES.getId());
227 228 patientsQuery.setType(type);
228 229 patientsQuery.setDueStatus(0);
229   - List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
230   - for(Patients patients:patientsList){
  230 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  231 + for (Patients patients : patientsList) {
231 232 //判断分娩日期是否大于24孕周
232   - if(fmDate.after(DateUtil.addDay(patients.getLastMenses(), 168))){
  233 + if (fmDate.after(DateUtil.addDay(patients.getLastMenses(), 168))) {
233 234 patients.setFmDate(fmDate);
234 235 patients.setType(3);
235 236 patientsService.updatePatient(patients);
236 237  
... ... @@ -324,13 +325,14 @@
324 325 /*list.add(baby2);
325 326 list.add(baby3);
326 327 list.add(baby4); */
327   - System.out.print(buildBabyName(list));;
  328 + System.out.print(buildBabyName(list));
  329 + ;
328 330  
329 331  
330 332 Date fmDate = DateUtil.parseYMD("2016-8-18");
331 333  
332 334  
333   - Date date= DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168);
  335 + Date date = DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168);
334 336 System.out.print(DateUtil.getyyyy_MM_dd(date));
335 337 System.out.print(fmDate.after(date));
336 338  
... ... @@ -347,7 +349,7 @@
347 349 * @param parentId
348 350 * @param userName
349 351 */
350   - private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients,String hospital) {
  352 + private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients, String hospital) {
351 353  
352 354  
353 355 List babyName = buildBabyName(list);
... ... @@ -452,9 +454,10 @@
452 454 } else if (null == patients) {
453 455 return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
454 456 }
455   - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());;
456   - if(days < 168 && patients.getFmDate() == null){
457   - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩");
  457 + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
  458 +
  459 + if (days < 168 && patients.getFmDate() == null) {
  460 + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩");
458 461 }
459 462  
460 463  
... ... @@ -464,6 +467,24 @@
464 467 List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
465 468 MatDeliverListResult matDeliverListResult = new MatDeliverListResult();
466 469 matDeliverListResult.convertToResult(list, patients);
  470 +
  471 +
  472 + if (CollectionUtils.isNotEmpty(list)) {
  473 + List<MatDeliverListResult.MatDeliverExt> list12 = new ArrayList<>();
  474 + for (MaternalDeliverModel model : list) {
  475 + MatDeliverListResult.MatDeliverExt matDeliverExt = new MatDeliverListResult.MatDeliverExt(model, patients.getCreated(), patients.getBuildType(), patients.getFmDate());
  476 + if (NumberUtils.isNumber(model.getFmHospital())) {
  477 + Organization organization = organizationService.getOrganization(Integer.valueOf(model.getFmHospital()));
  478 + if (null != organization) {
  479 + matDeliverExt.setHospitalName(organization.getName());
  480 + }
  481 + }
  482 + list12.add(matDeliverExt);
  483 + }
  484 + matDeliverListResult.setData(list12);
  485 + }
  486 +
  487 +
467 488 AntExQuery antExQuery = new AntExQuery();
468 489 antExQuery.setParentId(patients.getId());
469 490 antExQuery.setYn(YnEnums.YES.getId());
... ... @@ -522,12 +543,12 @@
522 543 MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult();
523 544  
524 545 maternalDeliverResult.convertToResult(deliverModel);
525   - String doctorId = deliverModel.getDeliverDoctor();
526   - Users users= usersService.getUsers(Integer.valueOf(doctorId));
527   - Map<String,String> map =new HashMap<>();
528   - if(null!=users){
529   - map.put("id",users.getId()+"");
530   - map.put("name",users.getName());
  546 + String doctorId = deliverModel.getDeliverDoctor();
  547 + Users users = usersService.getUsers(Integer.valueOf(doctorId));
  548 + Map<String, String> map = new HashMap<>();
  549 + if (null != users) {
  550 + map.put("id", users.getId() + "");
  551 + map.put("name", users.getName());
531 552 }
532 553 maternalDeliverResult.setDeliverDoctor(map);
533 554 //获取新生儿信息
534 555  
... ... @@ -538,16 +559,16 @@
538 559 babyList.add(maternalDeliverResult.new Baby(baby));
539 560 }
540 561 }
541   - Map<String,String> map1 =new HashMap<>();
542   - String fmHospital=deliverModel.getFmHospital();
  562 + Map<String, String> map1 = new HashMap<>();
  563 + String fmHospital = deliverModel.getFmHospital();
543 564  
544   - map1.put("id","-1");
545   - map1.put("name",fmHospital);
546   - if(NumberUtils.isNumber(fmHospital)){
547   - Organization organization= organizationService.getOrganization(Integer.valueOf(fmHospital));
548   - if(null!=organization){
549   - map1.put("id",organization.getId()+"");
550   - map1.put("name",organization.getName());
  565 + map1.put("id", "-1");
  566 + map1.put("name", fmHospital);
  567 + if (NumberUtils.isNumber(fmHospital)) {
  568 + Organization organization = organizationService.getOrganization(Integer.valueOf(fmHospital));
  569 + if (null != organization) {
  570 + map1.put("id", organization.getId() + "");
  571 + map1.put("name", organization.getName());
551 572 }
552 573 }
553 574  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ 6af8573
... ... @@ -109,13 +109,7 @@
109 109 int day = (days % 7);
110 110 this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
111 111 }
112   - if (CollectionUtils.isNotEmpty(destList)) {
113   - List<MatDeliverExt> list = new ArrayList<>();
114   - for (MaternalDeliverModel model : destList) {
115   - list.add(new MatDeliverExt(model, patients.getCreated(), patients.getBuildType(), patients.getFmDate()));
116   - }
117   - setData(list);
118   - }
  112 +
119 113 return this;
120 114 }
121 115  
... ... @@ -204,7 +198,7 @@
204 198 this.yChanQi = yChanQi;
205 199 }
206 200  
207   - private class MatDeliverExt {
  201 + public static class MatDeliverExt {
208 202 private String hospitalName;
209 203 private String hospitalId;
210 204 private String id;