Commit 012328d45a5e9e22a419cde86a519284a46f42cd
1 parent
5976ff736f
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 10 additions and 27 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
012328d
| ... | ... | @@ -328,8 +328,7 @@ |
| 328 | 328 | max = listDate.get(0).getDate(); |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | - HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel, min, max); | |
| 332 | - return highScoreResult; | |
| 331 | + return getPatLastRiskByDate(pid, needLevel, min, max); | |
| 333 | 332 | } |
| 334 | 333 | |
| 335 | 334 | /** |
| ... | ... | @@ -557,9 +556,7 @@ |
| 557 | 556 | patientsQuery1.setBookbuildingDateEnd(end); |
| 558 | 557 | if (listDate.size() > i + 1) { |
| 559 | 558 | patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000)); |
| 560 | - }/*else if(listDate.size()==i){ | |
| 561 | - patientsQuery1.setBookbuildingDateStart(new Date()); | |
| 562 | - }*/ | |
| 559 | + } | |
| 563 | 560 | pid = list.get(0).getPid(); |
| 564 | 561 | patientsQuery1.setPid(pid); |
| 565 | 562 | List<Patients> patientses = patientsService.queryPatient1(patientsQuery1); |
| 566 | 563 | |
| ... | ... | @@ -900,27 +897,7 @@ |
| 900 | 897 | if (null != patients.getFmDate()) { |
| 901 | 898 | dueDate = DateUtil.getyyyy_MM_dd(patients.getFmDate()); |
| 902 | 899 | } |
| 903 | - /*if (null!=patients.getFmDate()) { | |
| 904 | - MaternalDeliverModel model = modelList.get(0); | |
| 905 | - dueDate = model.getDueDate(); | |
| 906 | - } else { | |
| 907 | - PatientsQuery query1 = new PatientsQuery(); | |
| 908 | - query1.setCardNo(exListQueryRequest.getCardNo()); | |
| 909 | - query1.setYn(YnEnums.YES.getId()); | |
| 910 | - List<Patients> pats = patientsService.queryPatient(query1); | |
| 911 | - if (CollectionUtils.isNotEmpty(pats)) | |
| 912 | - { | |
| 913 | 900 | |
| 914 | - //终止妊娠 | |
| 915 | - StopPregQuery query = new StopPregQuery(); | |
| 916 | - query.setYn(YnEnums.YES.getId()); | |
| 917 | - query.setPatientId(patients.getId()); | |
| 918 | - stopPregs = stopPregnancyService.queryStopPreg(query); | |
| 919 | - if (CollectionUtils.isNotEmpty(stopPregs)) { | |
| 920 | - dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate()); | |
| 921 | - } | |
| 922 | - } | |
| 923 | - }*/ | |
| 924 | 901 | PostReviewQuery postReviewQuery = new PostReviewQuery(); |
| 925 | 902 | |
| 926 | 903 | postReviewQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -962,7 +939,6 @@ |
| 962 | 939 | if (list.size() - 1 > i) { |
| 963 | 940 | postReviewQuery.setStart(date); |
| 964 | 941 | //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 |
| 965 | -// postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); | |
| 966 | 942 | postReviewQuery.setEnd(list.get(i).getBookbuildingDate()); |
| 967 | 943 | } |
| 968 | 944 | } |
| ... | ... | @@ -1114,6 +1090,13 @@ |
| 1114 | 1090 | } |
| 1115 | 1091 | |
| 1116 | 1092 | if (null == patients) { |
| 1093 | + //查询是否还有其他记录 | |
| 1094 | + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 3, false, null); | |
| 1095 | + | |
| 1096 | + if(null!=patients){ | |
| 1097 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); | |
| 1098 | + } | |
| 1099 | + | |
| 1117 | 1100 | return new BaseResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("该孕妇还未在本院建档不能进行产检"); |
| 1118 | 1101 | } |
| 1119 | 1102 |