From 96ca94cae81c09af442db935f599dfb558fee313 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 20 Mar 2021 21:28:49 +0800 Subject: [PATCH] update --- .../platform/biz/service/AntExRecordService.java | 3 +- .../java/com/lyms/platform/pojo/AntExChuModel.java | 10 ++ .../com/lyms/platform/pojo/AntExRecordModel.java | 11 ++ .../platform/pojo/AntenatalExaminationModel.java | 11 ++ .../com/lyms/platform/query/AntExRecordQuery.java | 14 ++ .../controller/AntenatalExaminationController.java | 6 +- .../operate/web/facade/AntExRecordFacade.java | 156 ++++++++++++++++++++- .../operate/web/facade/MeasureInfoFacade.java | 9 +- .../platform/operate/web/facade/ViewFacade.java | 34 ++++- .../operate/web/request/AntExAddRequest.java | 12 ++ .../web/request/AntExManagerQueryRequest.java | 10 ++ .../operate/web/request/AntExcAddRequest.java | 12 ++ .../operate/web/result/AntExManagerResult.java | 10 ++ .../web/result/AntenatalExaminationResult.java | 10 ++ .../operate/web/result/AntexChuResult.java | 12 +- .../operate/web/worker/AntExRecordWorker.java | 10 ++ 16 files changed, 315 insertions(+), 15 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index a109b37..a02b191 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -187,7 +187,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntenatalExaminationModel antEx) { AntExRecordModel antExRecordModel = new AntExRecordModel(); - + antExRecordModel.setOperaterUserId(antEx.getOperaterUserId()); antExRecordModel.setZyzlState(antEx.getZyzlState()); antExRecordModel.setZyzlContent(antEx.getZyzlContent()); antExRecordModel.setZywzzlState(antEx.getZywzzlState()); @@ -264,6 +264,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntExChuModel antExChuModel) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + antExRecordModel.setOperaterUserId(antExChuModel.getOperaterUserId()); antExRecordModel.setTreatOpinion(antExChuModel.getTreatOpinion()); antExRecordModel.setScreenResult(antExChuModel.getScreenResult()); antExRecordModel.setCheckDoctor(antExChuModel.getProdDoctor()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 72c0c08..acf99f0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -474,6 +474,16 @@ public class AntExChuModel extends BaseModel { //患者签名 private String patientSign; + //操作人id + private String operaterUserId; + + public String getOperaterUserId() { + return operaterUserId; + } + + public void setOperaterUserId(String operaterUserId) { + this.operaterUserId = operaterUserId; + } public String getDoctorSign() { return doctorSign; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index 2297c73..030b998 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -116,6 +116,17 @@ public class AntExRecordModel extends BaseModel { //处理意见 private String treatOpinion; + //操作人id + private String operaterUserId; + + public String getOperaterUserId() { + return operaterUserId; + } + + public void setOperaterUserId(String operaterUserId) { + this.operaterUserId = operaterUserId; + } + public int getDueStatus() { return dueStatus; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 4b71ce7..086d9a1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -369,6 +369,17 @@ public class AntenatalExaminationModel extends BaseModel { //羊水量 private String bamnio; + //操作人id + private String operaterUserId; + + public String getOperaterUserId() { + return operaterUserId; + } + + public void setOperaterUserId(String operaterUserId) { + this.operaterUserId = operaterUserId; + } + public String getBamnio() { return bamnio; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index a57fcf3..549cf83 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -82,6 +82,17 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private Boolean isOpinion; + //操作人id + private String operaterUserId; + + public String getOperaterUserId() { + return operaterUserId; + } + + public void setOperaterUserId(String operaterUserId) { + this.operaterUserId = operaterUserId; + } + public Date getNextCheckTimeStart() { return nextCheckTimeStart; } @@ -601,6 +612,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(phone)) { condition = condition.and("phone", phone, MongoOper.IS); } + if (StringUtils.isNotEmpty(operaterUserId)) { + condition = condition.and("operaterUserId", operaterUserId, MongoOper.IS); + } if (null != id) { condition = condition.and("id", id, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index c674851..a526b5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -525,8 +525,10 @@ public class AntenatalExaminationController extends BaseController { @RequestParam(value = "pid") String pid, @RequestParam(value = "hospitalId") String hospitalId, @RequestParam(value = "nextTime", required = false) String nextTime, - @RequestParam(value = "doctorId", required = false) String doctorId) { - return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr, pid, hospitalId, nextTime, doctorId); + @RequestParam(value = "doctorId", required = false) String doctorId, + @RequestParam(value = "edema", required = false) String edema + ) { + return antExRecordFacade.inputWxData(fuh, abdominalGirth, fhr,edema, pid, hospitalId, nextTime, doctorId); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index af18eec..1dc3970 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -18,10 +18,7 @@ import com.lyms.platform.operate.web.utils.ResolveUtils; import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.operate.web.utils.UnitUtils; import com.lyms.platform.operate.web.worker.AntExRecordWorker; -import com.lyms.platform.permission.model.CheckItem; -import com.lyms.platform.permission.model.Organization; -import com.lyms.platform.permission.model.OrganizationQuery; -import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -123,6 +120,7 @@ public class AntExRecordFacade { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setDueStatus(antExManagerQueryRequest.getDeuStatus()); + antExRecordQuery.setOperaterUserId(antExManagerQueryRequest.getOperaterUserId()); antExRecordQuery.setZyzlState(antExManagerQueryRequest.getZyzlState()); antExRecordQuery.setZywzzlState(antExManagerQueryRequest.getZywzzlState()); @@ -1600,6 +1598,8 @@ public class AntExRecordFacade { return; } + boolean isInput = false; + List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel model : antExChuModels) { @@ -1609,7 +1609,7 @@ public class AntExRecordFacade { model.setHeight(nutritionInfoRequest.getBeforeHeight()); model.setYqWeight(nutritionInfoRequest.getBeforeWeight()); antenatalExaminationService.updateAntExChu(model, model.getId()); - break; + isInput = true; } } } @@ -1621,9 +1621,15 @@ public class AntExRecordFacade { DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) { model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); antenatalExaminationService.updateOneAnt(model, model.getId()); + isInput = true; } } } + + if (!isInput) + { + inputData(nutritionInfoRequest); + } } @@ -1639,7 +1645,7 @@ public class AntExRecordFacade { * @param doctorId * @return */ - public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr, String pid, String hospitalId, String nextTime, String doctorId) { + public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr,String edema, String pid, String hospitalId, String nextTime, String doctorId) { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); boolean falg = true; if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { @@ -1666,6 +1672,8 @@ public class AntExRecordFacade { model.setTireNumber(list.size() + ""); } + model.setCheckDoctor(doctorId); + model.setEdema(edema); antenatalExaminationService.updateOneAnt(model, model.getId()); falg = false; break; @@ -1702,6 +1710,7 @@ public class AntExRecordFacade { AntExAddRequest antExAddRequest = new AntExAddRequest(); antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); antExAddRequest.setCheckDoctor(doctorId); + antExAddRequest.setEdema(edema); antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" antExAddRequest.setParentId(patients.getId()); @@ -1855,6 +1864,141 @@ public class AntExRecordFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + + + public BaseResponse inputData(NutritionInfoRequest nutritionInfoRequest) { + boolean falg = true; + if (StringUtils.isNotEmpty(nutritionInfoRequest.getPid()) && StringUtils.isNotEmpty(nutritionInfoRequest.getHospitalId())) { + if (isOpenAutoSaveAntenatal(nutritionInfoRequest.getHospitalId())) { + List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(nutritionInfoRequest.getPid())), + AntenatalExaminationModel.class); + if (CollectionUtils.isNotEmpty(examinationModel)) { + for (AntenatalExaminationModel model : examinationModel) { + if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckDate())) && + DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) { + model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); + if (StringUtils.isNotEmpty(nutritionInfoRequest.getSsy()) && StringUtils.isNotEmpty(nutritionInfoRequest.getSzy())) + { + Map map = new HashMap(); + map.put("ssy",nutritionInfoRequest.getSsy()); + map.put("szy",nutritionInfoRequest.getSzy()); + model.setBp(JsonUtil.array2JsonString(map)); + } + antenatalExaminationService.updateOneAnt(model, model.getId()); + falg = false; + break; + } + } + } + if (falg) { + //创建一条复诊记录 + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(nutritionInfoRequest.getPid()).and("hospitalId").is(nutritionInfoRequest.getHospitalId()).and("type").is(1).and("yn").is(1)), Patients.class); + //当前医院没有档案,创建隐藏档案 + if (patients == null) + { + patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(nutritionInfoRequest.getPid()).and("type").is(1).and("yn").is(1).and("source").exists(false)), Patients.class); + if (patients != null) + { + String source = patients.getId(); + patients.setId(null); + patients.setSource(source); + patients.setEnable("2");//隐藏档案 + patients.setHospitalId(nutritionInfoRequest.getHospitalId()); + patients = patientsService.addPatient(patients); + } + } + if (null != patients) { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setPid(patients.getPid()); + antExChuQuery.setCheckTimeStart(patients.getLastMenses()); + antExChuQuery.setCheckTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42)); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + + AntExAddRequest antExAddRequest = new AntExAddRequest(); + antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); + antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " + antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" + antExAddRequest.setParentId(patients.getId()); + antExAddRequest.setPid(patients.getPid()); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); + if (highScoreResult != null) { + List> list = highScoreResult.getHighRisk(); + List stringList = new ArrayList<>(); + List maps = new ArrayList<>(); + for (Map map : list) { + if (null != map.get("otherId")) { + maps.add(map); + } else { + stringList.add(map.get("id").toString()); + } + } + antExAddRequest.setHighriskDesc(highScoreResult.getHighriskDesc()); + //高危因素 + antExAddRequest.setRiskFactor(stringList); + //其他高危 + antExAddRequest.setOtherRisk(maps); + } + antExAddRequest.setRiskFactor(patients.getRiskFactorId()); + antExAddRequest.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); + + antExAddRequest.setTireNumber(nutritionInfoRequest.getTireNumber()); + GuidelinesQuery guidelinesQuery = new GuidelinesQuery(); + guidelinesQuery.setType(1); + + Integer start = DateUtil.getWeek(patients.getLastMenses(), new Date()); + if (start <= 5) { + start = 5; + } + guidelinesQuery.setMaxStart(start); + guidelinesQuery.setMinEnd(start); + //System.out.println("指导意见查询条件：" + guidelinesQuery.convertToQuery().convertToMongoQuery()); + List lists = guidelinesService.queryGuidelines(guidelinesQuery); + StringBuilder stringBuilder = new StringBuilder(128); + if (CollectionUtils.isNotEmpty(lists)) { + for (Guidelines guidelines : lists) { + stringBuilder.append(guidelines.getCategory()).append(" ").append(guidelines.getContent()).append("\r\n"); + } + } + antExAddRequest.setGuide(stringBuilder.toString()); + //获取血压记录 + List bloodPressures = mongoTemplate.find(Query.query(Criteria.where("pid").is(patients.getPid()).and("yn").is(1)), BloodPressure.class); + if (CollectionUtils.isNotEmpty(bloodPressures)) { + BloodPressure one = bloodPressures.get(0); + Map> infos = one.getInfos(); + Map map = infos.get(DateUtil.getyyyy_MM_dd(new Date())); + if (map != null && map.size() > 0) { + Map mapBp = new HashMap(); + mapBp.put("ssy", map.get("ssy")); + mapBp.put("szy", map.get("szy")); + antExAddRequest.setBp(mapBp); + } + } + else + { + Map mapBp = new HashMap(); + mapBp.put("ssy", nutritionInfoRequest.getSsy()); + mapBp.put("szy", nutritionInfoRequest.getSzy()); + antExAddRequest.setBp(mapBp); + } + + UsersQuery query = new UsersQuery(); + query.setOrgId(Integer.parseInt(nutritionInfoRequest.getHospitalId())); + List list = usersService.queryUsers(query); + antenatalExaminationFacade.addOneAntEx(antExAddRequest, list.get(0).getId()); + } + } + } + } + + } else { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("未获取到医院名称!"); + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + public BaseResponse queryAnteHistory(String hospitalId, String pid) { if (StringUtils.isNotEmpty(hospitalId) && StringUtils.isNotEmpty(pid)) { WxMeasureInfoModel wxMeasureInfo = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)), WxMeasureInfoModel.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 12110d8..25c2096 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -1187,6 +1187,7 @@ public class MeasureInfoFacade { bloodPressureService.update(bloodPressure); } + boolean isInput = false; //初诊自动填写血压 List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class); if (CollectionUtils.isNotEmpty(antExChuModels)) { @@ -1199,7 +1200,7 @@ public class MeasureInfoFacade { map.put("ssy", bloodPressure.getSsy()); model.setBp(JsonUtil.obj2JsonString(map)); antenatalExaminationService.updateAntExChu(model, model.getId()); - break; + isInput = true; } catch (Exception e) { } @@ -1226,11 +1227,17 @@ public class MeasureInfoFacade { map.put("ssy", bloodPressure.getSsy()); examinationModel.setBp(JsonUtil.obj2JsonString(map)); antenatalExaminationService.updateOneAnt(examinationModel, examinationModel.getId()); + isInput = true; } catch (Exception e) { } } + if (!isInput) + { + antExRecordFacade.inputData(nutritionInfoRequest); + } + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); measureInfoRequest.setCertNo(p.getCardNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index f2a407b..1838927 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1760,9 +1760,16 @@ public class ViewFacade { map.put("id", data.getId()); String edema = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) { - for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { - if (data.getEdema().equals(fuZhongEnums.getId())) { - edema = fuZhongEnums.getName(); + if (Integer.parseInt(data.getEdema()) > 3) + { + edema = "4".equals(data.getEdema()) ? "有" : "无"; + } + else + { + for (FuZhongEnums fuZhongEnums : FuZhongEnums.values()) { + if (data.getEdema().equals(fuZhongEnums.getId())) { + edema = fuZhongEnums.getName(); + } } } } @@ -1817,6 +1824,18 @@ public class ViewFacade { } } map.put("checkDoctor", checkDoctor); + + + String operaterUser = ""; + + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getOperaterUserId())) { + Users users = usersService.getUsers(Integer.parseInt(data.getOperaterUserId())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + operaterUser = users.getName(); + } + } + map.put("operaterUser", operaterUser); + String hospital = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) { Organization organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId())); @@ -3054,7 +3073,14 @@ public class ViewFacade { map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2())); map.put("quicken", QuickenEnums.getName(data.getQuicken())); map.put("quickenRemark", data.getQuickenRemark()); - + String operaterUser = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getOperaterUserId())) { + Users users = usersService.getUsers(Integer.parseInt(data.getOperaterUserId())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + operaterUser = users.getName(); + } + } + map.put("operaterUser", operaterUser); //早孕期病毒检测 // private String zyqbdjc; //nt检查 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index fc8f28b..acf604c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -354,6 +354,17 @@ public class AntExAddRequest implements IBasicRequestConvert { //患者签名 private String patientSign; + //操作人id + private String operaterUserId; + + public String getOperaterUserId() { + return operaterUserId; + } + + public void setOperaterUserId(String operaterUserId) { + this.operaterUserId = operaterUserId; + } + public String getDoctorSign() { return doctorSign; } @@ -2365,6 +2376,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { } antExChuModel.setCheckResult(checkResult); + antExChuModel.setOperaterUserId(operaterUserId); return antExChuModel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java index 1f1126d..c9632a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java @@ -75,6 +75,16 @@ public class AntExManagerResult { //户籍地址 private String address; + //操作人id + private String operaterUser; + + public String getOperaterUser() { + return operaterUser; + } + + public void setOperaterUser(String operaterUser) { + this.operaterUser = operaterUser; + } public String getCardNo() { return cardNo; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index bc6ffc4..630397d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -532,7 +532,16 @@ public class AntenatalExaminationResult implements IBasicResultConvert> { } } + //产检医生 + if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getOperaterUserId())) { + if (NumberUtils.isNumber(e.getOperaterUserId())) { + Users users = usersService.getUsers(NumberUtils.toInt(e.getOperaterUserId())); + if (null != users) { + antExManagerResult.setOperaterUser(users.getName()); + } + } + } + AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); Patients patients = patientsService.findOnePatientById(e.getParentId()); antExRecordQuery1.setCheckTimeStart(patients.getLastMenses()); -- 1.8.3.1