Commit d2f05e31d9b875a014751c8f193df08453bcc708
1 parent
6ca684c6a2
Exists in
master
and in
6 other branches
转诊单增加建档出增加source
Showing 3 changed files with 12 additions and 16 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
d2f05e3
| ... | ... | @@ -243,7 +243,7 @@ |
| 243 | 243 | return extEnable; |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - public void setExtEnable(boolean extEnable) { | |
| 246 | + public void setExtEnable(Boolean extEnable) { | |
| 247 | 247 | this.extEnable = extEnable; |
| 248 | 248 | } |
| 249 | 249 | |
| ... | ... | @@ -1129,6 +1129,10 @@ |
| 1129 | 1129 | } else if (null != smsBuildTypeList) { |
| 1130 | 1130 | condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN); |
| 1131 | 1131 | } |
| 1132 | + //enable ： | |
| 1133 | + // 0，转诊建档，待接收 | |
| 1134 | + // 1，转诊建档，已接收 | |
| 1135 | + // 2，隐藏建档，在A院建档去B医院做产检-----建档管理里面不展示 | |
| 1132 | 1136 | if (null != extEnable) { |
| 1133 | 1137 | List list = new ArrayList(); |
| 1134 | 1138 | list.add("1"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
d2f05e3
| ... | ... | @@ -970,11 +970,11 @@ |
| 970 | 970 | patientsQuery.setPid(exListQueryRequest.getPid()); |
| 971 | 971 | patientsQuery.setBuildType(1); |
| 972 | 972 | patientsQuery.setSort("created"); |
| 973 | - //在区域组的时候不用查询隐藏档案 | |
| 973 | + //在区域组的时候不用查询隐藏档案，但是这里看不见转诊过来的数据 | |
| 974 | 974 | if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) { |
| 975 | 975 | patientsQuery.setExtEnable(false); |
| 976 | 976 | } |
| 977 | - // System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery()); | |
| 977 | + System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery()); | |
| 978 | 978 | //获取所有的建档记录 |
| 979 | 979 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 980 | 980 | AntexListResult antexListResult = new AntexListResult(); |
| ... | ... | @@ -988,6 +988,8 @@ |
| 988 | 988 | HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); |
| 989 | 989 | antexListResult.setRiskFactor(highScoreResult.getHighRisk()); |
| 990 | 990 | antexListResult.setRiskScore(highScoreResult.getScoreStr()); |
| 991 | + | |
| 992 | + //查询产检记录 | |
| 991 | 993 | distPatientData(list, sortList); |
| 992 | 994 | } |
| 993 | 995 | antexListResult.setData(sortList); |
| ... | ... | @@ -1438,6 +1440,7 @@ |
| 1438 | 1440 | |
| 1439 | 1441 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 1440 | 1442 | patientsQuery.setSource(patients.getId()); |
| 1443 | + | |
| 1441 | 1444 | patientsQuery.setBuildType(1); |
| 1442 | 1445 | List<Patients> patients1 = patientsService.queryPatient(patientsQuery); |
| 1443 | 1446 | if (CollectionUtils.isNotEmpty(patients1)) { |
| ... | ... | @@ -1446,12 +1449,6 @@ |
| 1446 | 1449 | //初诊记录 |
| 1447 | 1450 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 1448 | 1451 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 1449 | - // antExChuQuery.setStart(patients.getBookbuildingDate()); | |
| 1450 | - // if (null == patients.getFmDate()) { | |
| 1451 | - // antExChuQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); | |
| 1452 | - // } else { | |
| 1453 | - // antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); | |
| 1454 | - // } | |
| 1455 | 1452 | if (patients2 != null) { |
| 1456 | 1453 | antExChuQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); |
| 1457 | 1454 | } else { |
| ... | ... | @@ -1470,12 +1467,6 @@ |
| 1470 | 1467 | //复诊记录 |
| 1471 | 1468 | AntExQuery antExQuery = new AntExQuery(); |
| 1472 | 1469 | antExQuery.setYn(YnEnums.YES.getId()); |
| 1473 | - // antExQuery.setStart(patients.getBookbuildingDate()); | |
| 1474 | - // if (null == patients.getFmDate()) { | |
| 1475 | - // antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); | |
| 1476 | - // } else { | |
| 1477 | - // antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); | |
| 1478 | - // } | |
| 1479 | 1470 | if (patients2 != null) { |
| 1480 | 1471 | antExQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); |
| 1481 | 1472 | } else { |
| ... | ... | @@ -2262,7 +2253,7 @@ |
| 2262 | 2253 | antExQuery.setYn(YnEnums.YES.getId()); |
| 2263 | 2254 | antExQuery.setPid(patients.getPid()); |
| 2264 | 2255 | antExQuery.setStart(max); |
| 2265 | - //查询产前检查记录 | |
| 2256 | + //查询复诊记录 | |
| 2266 | 2257 | List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
| 2267 | 2258 | |
| 2268 | 2259 | antexListResult.convertToResult(list, patients, antExChulist); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
d2f05e3
| ... | ... | @@ -220,6 +220,7 @@ |
| 220 | 220 | patients.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); |
| 221 | 221 | patients.setExpVip(0); |
| 222 | 222 | patients.setEnable("0"); |
| 223 | + patients.setSource(referralApplyOrderAddRequest.getParentId()); | |
| 223 | 224 | id = patientsService.addPatient(patients).getId(); |
| 224 | 225 | operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), patients, OptActionEnums.ADD.getId(), "添加孕妇转诊"); |
| 225 | 226 | } else { |