diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 201b5b2..d18dbee 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -418,6 +418,17 @@ public class Patients extends BaseModel { //秦皇岛乳房检查状态0:未做,1:已做。 是否检查 private String breastType; + //分娩医生 + private String deliverDoctor; + + public String getDeliverDoctor() { + return deliverDoctor; + } + + public void setDeliverDoctor(String deliverDoctor) { + this.deliverDoctor = deliverDoctor; + } + public String getBreastType() { return breastType; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 0b92db8..cdc9e87 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -400,6 +400,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //秦皇岛乳房检查状态0:未做,1:已做。 是否检查 private String breastType; + //分娩医生 + private String deliverDoctor; + + public String getDeliverDoctor() { + return deliverDoctor; + } + + public void setDeliverDoctor(String deliverDoctor) { + this.deliverDoctor = deliverDoctor; + } + public String getBreastType() { return breastType; } @@ -825,6 +836,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition=condition.and("firstCheckId",null,MongoOper.IS); } } + //分娩医生 + if (StringUtils.isNotEmpty(deliverDoctor)) { + condition = condition.and("deliverDoctor", deliverDoctor, MongoOper.IS); + } //筛选乳房列表是否做过检查0,1。false为了查出数据中没有该字段的。 Criteria c2=MongoCondition.newInstance().getCriteria(); if(StringUtils.isNotEmpty(breastType)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index e41d8fe..e823da2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -461,6 +461,11 @@ public class MatDeliverFacade { //新增分娩信息 matDeliverService.addMatDeliver(maternalDeliverModel); + //分娩医生同步到Patients主档案。 + Query query = Query.query(Criteria.where("id").is(maternalDeliverModel.getParentId())); + Update update = new Update(); + update.set("deliverDoctor", maternalDeliverModel.getDeliverDoctor()); + mongoTemplate.updateFirst(query, update, Patients.class); /*//儿童自动诊断,20210109 张洁说分娩时候不用自动诊断 try { @@ -548,6 +553,12 @@ public class MatDeliverFacade { List results = matDeliverService.query(query); matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); + //分娩医生同步到Patients主档案。 + Query query2 = Query.query(Criteria.where("id").is(maternalDeliverModel.getParentId())); + Update update2 = new Update(); + update2.set("deliverDoctor", maternalDeliverModel.getDeliverDoctor()); + mongoTemplate.updateFirst(query2, update2, Patients.class); + if (CollectionUtils.isNotEmpty(results)) { operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩"); } @@ -2629,6 +2640,10 @@ public class MatDeliverFacade { // 分娩方式去另外一张表查 patientsQuery.setDesc("fmDate"); patientsQuery.setSort("fmDate"); + //隆化需求按接诊医生查询 + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) { + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); + } List patientsList = patientsService.queryPatient(patientsQuery); // 这里就设置分页内容 @@ -2753,10 +2768,6 @@ public class MatDeliverFacade { } } } - //隆化需求按接诊医生查询 - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) { - matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); - } /**********增加完毕***********/