shiyang / regional-platform

Download as
Browse Code »

Commit 6684733142d5b9ad6a150a92c45c4d9a482f1de5

Authored by jiangjiazhi
1 parent 21e28abe8e
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 1 changed file with 49 additions and 40 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 6684733
... ... @@ -115,8 +115,8 @@
115 115 referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
116 116 referralApplyOrderModel.setBirth(patients.getBirth());
117 117 referralApplyOrderModel.setExpVip(patients.getExpVip());
118   - int days=-1;
119   - if(patients.getType()==1){
  118 + int days = -1;
  119 + if (patients.getType() == 1) {
120 120 days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
121 121 }
122 122 referralApplyOrderModel.setLastMenses(patients.getLastMenses());
123 123  
124 124  
... ... @@ -137,12 +137,12 @@
137 137 patientsQuery1.setHospitalId(referralApplyOrderModel.getTransferredHospital());
138 138 List<Patients> patientsList = patientsService.queryPatient(patientsQuery1);
139 139  
140   - List<Organization> organization =null;
  140 + List<Organization> organization = null;
141 141 try {
142   - OrganizationQuery organizationQuery=new OrganizationQuery();
  142 + OrganizationQuery organizationQuery = new OrganizationQuery();
143 143 organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital()));
144   - organization= organizationService.queryOrganization(organizationQuery);
145   - if (CollectionUtils.isEmpty(patientsList)&&CollectionUtils.isNotEmpty(organization)) {
  144 + organization = organizationService.queryOrganization(organizationQuery);
  145 + if (CollectionUtils.isEmpty(patientsList) && CollectionUtils.isNotEmpty(organization)) {
146 146 //在转入的医院建档
147 147 patients.setId(null);
148 148 patients.setHospitalId(referralApplyOrderModel.getTransferredHospital());
... ... @@ -159,7 +159,7 @@
159 159 patients1.setBuildType(3);
160 160 patientsService.updatePatient(patients1);
161 161 }
162   - }catch (Exception e){
  162 + } catch (Exception e) {
163 163  
164 164 }
165 165 }
... ... @@ -193,24 +193,33 @@
193 193 babyModelQuery.setHospitalId(referralApplyOrderModel.getTransferredHospital());
194 194 babyModelQuery.setYn(YnEnums.YES.getId());
195 195 List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
196   - //没有儿童档案的时候才建档
197   - if (CollectionUtils.isEmpty(babyModels)) {
198   - ////在转入的医院新增儿童建档
199   - babyModel.setId(null);
200   - babyModel.setHospitalId(referralApplyOrderModel.getTransferredHospital());
201   - babyModel.setBuildDoctor(null);
202   - babyModel.setBuildDate(new Date());
203   - babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
204   - babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
205   - babyModel.setExpVip(0);
206   - babyModel.setBuildType(3);
207   - id = babyService.addOneBaby(babyModel).getId();
208   - } else {
209   - BabyModel babyModel1 = babyModels.get(0);
210   - id = babyModel1.getId();
211   - babyModel1.setModified(new Date());
212   - babyModel1.setBuildType(3);
213   - babyService.updateOneBaby(babyModel1, babyModel1.getId());
  196 +
  197 + List<Organization> organization = null;
  198 + try {
  199 + OrganizationQuery organizationQuery = new OrganizationQuery();
  200 + organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital()));
  201 + organization = organizationService.queryOrganization(organizationQuery);
  202 + if (CollectionUtils.isEmpty(babyModels) && CollectionUtils.isNotEmpty(organization)) {
  203 + //没有儿童档案的时候才建档
  204 + ////在转入的医院新增儿童建档
  205 + babyModel.setId(null);
  206 + babyModel.setHospitalId(referralApplyOrderModel.getTransferredHospital());
  207 + babyModel.setBuildDoctor(null);
  208 + babyModel.setBuildDate(new Date());
  209 + babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
  210 + babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
  211 + babyModel.setExpVip(0);
  212 + babyModel.setBuildType(3);
  213 + id = babyService.addOneBaby(babyModel).getId();
  214 + } else {
  215 + BabyModel babyModel1 = babyModels.get(0);
  216 + id = babyModel1.getId();
  217 + babyModel1.setModified(new Date());
  218 + babyModel1.setBuildType(3);
  219 + babyService.updateOneBaby(babyModel1, babyModel1.getId());
  220 + }
  221 + } catch (Exception e) {
  222 +
214 223 }
215 224 }
216 225 }
... ... @@ -477,7 +486,7 @@
477 486 }
478 487 //根据孕周
479 488 if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) {
480   - int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek()) * 7+6;
  489 + int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek()) * 7 + 6;
481 490 referralApplyOrderQuery.setDueDateEnd(i);
482 491 }
483 492 if (null != applyOrderQueryRequest.getStartDueWeek()) {
484 493  
485 494  
... ... @@ -508,17 +517,17 @@
508 517 referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
509 518 //1 转入 0转出
510 519 if ("1".equals(applyOrderQueryRequest.getAction())) {
511   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){
512   - if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){
  520 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) {
  521 + if (NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())) {
513 522 referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital());
514   - }else{
  523 + } else {
515 524 OrganizationQuery organizationQuery = new OrganizationQuery();
516 525 organizationQuery.setYn(YnEnums.YES.getId());
517 526 organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
518 527 List<Organization> organization = organizationService.queryOrganization(organizationQuery);
519 528 if (CollectionUtils.isNotEmpty(organization)) {
520   - referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId()+"");
521   - }else{
  529 + referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId() + "");
  530 + } else {
522 531 referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital());
523 532 }
524 533 }
525 534  
526 535  
... ... @@ -526,17 +535,17 @@
526 535  
527 536 referralApplyOrderQuery.setTransferredHospital(hospital);
528 537 } else if ("0".equals(applyOrderQueryRequest.getAction())) {
529   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){
530   - if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){
  538 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) {
  539 + if (NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())) {
531 540 referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
532   - }else{
  541 + } else {
533 542 OrganizationQuery organizationQuery = new OrganizationQuery();
534 543 organizationQuery.setYn(YnEnums.YES.getId());
535 544 organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
536 545 List<Organization> organization = organizationService.queryOrganization(organizationQuery);
537 546 if (CollectionUtils.isNotEmpty(organization)) {
538   - referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+"");
539   - }else{
  547 + referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId() + "");
  548 + } else {
540 549 referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
541 550 }
542 551 }
543 552  
... ... @@ -579,12 +588,12 @@
579 588 }
580 589 }
581 590 HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
582   - StringBuilder stringBuilder=new StringBuilder(highScoreResult.gethighRiskStr());
583   - if(StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){
584   - if(stringBuilder.length()>0&&StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){
  591 + StringBuilder stringBuilder = new StringBuilder(highScoreResult.gethighRiskStr());
  592 + if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
  593 + if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
585 594 stringBuilder.append(",");
586 595 }
587   - if(StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){
  596 + if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
588 597 stringBuilder.append(orderModel.getOtherHighRisk());
589 598 }
590 599 }