liquanyu / regional-platform

Download as
Browse Code »

Commit 1e311a32cca9d472f479f93e5c308463d72f3ae1

Authored by liquanyu
1 parent eeb22f00d5
Exists in master and in 1 other branch dev

update

Showing 2 changed files with 25 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 1e311a3
... ... @@ -1572,9 +1572,30 @@
1572 1572 if (falg) {
1573 1573 //创建一条复诊记录
1574 1574 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("type").is(1).and("yn").is(1)), Patients.class);
  1575 + //当前医院没有档案,创建隐藏档案
  1576 + if (patients == null)
  1577 + {
  1578 + patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is(1).and("yn").is(1).and("source").exists(false)), Patients.class);
  1579 + if (patients != null)
  1580 + {
  1581 + String source = patients.getId();
  1582 + patients.setId(null);
  1583 + patients.setSource(source);
  1584 + patients.setEnable("2");//隐藏档案
  1585 + patients.setHospitalId(hospitalId);
  1586 + patients = patientsService.addPatient(patients);
  1587 + }
  1588 + }
1575 1589 if (null != patients) {
1576   - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), AntExChuModel.class);
1577   - if (null != antExChuModel) {
  1590 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  1591 + antExChuQuery.setYn(YnEnums.YES.getId());
  1592 + antExChuQuery.setPid(patients.getPid());
  1593 + antExChuQuery.setCheckTimeStart(patients.getLastMenses());
  1594 + antExChuQuery.setCheckTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42));
  1595 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  1596 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  1597 + AntExChuModel antExChuModel = antExChuModels.get(0);
  1598 +
1578 1599 AntExAddRequest antExAddRequest = new AntExAddRequest();
1579 1600 antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date()));
1580 1601 antExAddRequest.setCheckDoctor(doctorId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 1e311a3
... ... @@ -1805,8 +1805,8 @@
1805 1805 sieveHuada.setGestationalWeeks(getWeeks(sieveHuada.getGestationalWeeks()));//孕周
1806 1806 sieveHuada.setChargeType("3");
1807 1807 sieveHuada.setSampleType("S051");
1808   - sieveHuada.setIsNeedOtherChromReport("0");
1809   - sieveHuada.setIsNeedReportOtherResult("0");
  1808 + sieveHuada.setIsNeedOtherChromReport("1");
  1809 + sieveHuada.setIsNeedReportOtherResult("1");
1810 1810  
1811 1811  
1812 1812 Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);