diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java index 9ae36d6..4ffa493 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java @@ -27,36 +27,38 @@ public class StopPregnancyController extends BaseController { /** * 添加/更新 终止妊娠 + * * @param request * @return */ @RequestMapping(method = RequestMethod.POST, value = "/addOrUpStopPreg") @ResponseBody @TokenRequired - public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest params,HttpServletRequest request) { - if (!StringUtils.isEmpty(params.getId())) - { + public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest params, HttpServletRequest request) { + if (!StringUtils.isEmpty(params.getId())) { return stopPregnancyFacade.updateStopPreg(params); } LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return stopPregnancyFacade.addStopPreg(params,loginState.getId()); + return stopPregnancyFacade.addStopPreg(params, loginState.getId()); } /** - *查询终止妊娠记录 + * 查询终止妊娠记录 + * * @param id 孕妇建档Id * @return */ @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{id}") @ResponseBody - public BaseResponse queryStopPreg(@PathVariable("id")String id) { + public BaseResponse queryStopPreg(@PathVariable("id") String id) { return stopPregnancyFacade.queryStopPreg(id); } /** * 返回该医院可选择的录入人 + * * @return */ @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson") @@ -66,8 +68,10 @@ public class StopPregnancyController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return stopPregnancyFacade.queryInPerson(loginState.getId()); } + /** * 返回该医院可选择的录入人 + * * @return */ @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson2") @@ -77,4 +81,16 @@ public class StopPregnancyController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return stopPregnancyFacade.queryInPerson2(loginState.getId()); } + + /** + * 小程序返回机构下医生的列表 + **/ + @RequestMapping(method = RequestMethod.GET, value = "/wx/queryInPerson3") + @ResponseBody + @TokenRequired + public BaseResponse queryInPerson3(String orgId) { + return stopPregnancyFacade.queryInPerson3(Integer.parseInt(orgId)); + } + + } 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 9162114..8ed8a3d 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 @@ -81,6 +81,9 @@ public class AntExRecordFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private ModularFunctionConfigService modularFunctionConfigServcie; + public void syncAntRecordToList(String hospitalId) { recordService.syncAntRecordToList(hospitalId); } @@ -880,51 +883,66 @@ public class AntExRecordFacade { public BaseResponse inputWxData(String fuh, String abdominalGirth, String fhr, String pid, String hospitalId, String nextTime) { WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); boolean falg = true; + String value = null; if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { - List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid)), 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()))) { - falg = false; + //查询当前医院是否有配置此权限 + ModularFunctionConfigModel functionConfigModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), ModularFunctionConfigModel.class); + if (null != functionConfigModel) { + List> mapList = functionConfigModel.getConfigs(); + if (CollectionUtils.isNotEmpty(mapList)) { + for (Map map : mapList) { + if (map.get("type").toString().equals("88")) { + value = map.get("value").toString(); + } } } } - if (falg) { - //创建一条复诊记录 - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("type").is(1)), Patients.class); - if (null != patients) { - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), AntExChuModel.class); - if (null != antExChuModel) { - AntExAddRequest antExAddRequest = new AntExAddRequest(); - antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); - antExAddRequest.setCheckDoctor("1000000185"); - antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " - antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" - antExAddRequest.setGuide("个人卫生 受激素影响怀孕后肤质与孕前不一样，保养皮肤请做好日常清洁并避免使用刺激性的护肤品与保养品。" + - "心理调节 心理状态不佳更需家人陪伴与支持，可与丈夫一起上孕妇学校课程、或与丈夫携手散步、又或让丈夫给您进行甜蜜按摩。" + - "营养 虽然孕期体重增加过多会增加你的高血压和怀上巨大儿的可能性。但是也不要进入饮食的误区，靠节食来减缓体重增长的速度。" + - "正确的方法是，请医生给你一些均衡饮食的建议，使你能够达到孕期的标准体重。" + - "运动 骨盆底肌肉练习：从现在起，你可以开始做骨盆底肌肉练习了，这个运动可以帮助你分娩的更快、更容易。" + - "骨盆底肌肉练习的步骤是：收缩肛门、阴道，再放松。重复这个动作30次。" + - "其他 当宝贝活动较多的时候，可跟老公一起给宝贝读些优美的诗歌，享受一家人的幸福时光。"); - antExAddRequest.setParentId(patients.getId()); - antExAddRequest.setPid(pid); - antExAddRequest.setRiskFactor(patients.getRiskFactorId()); - antExAddRequest.setGongGao(fuh); - antExAddRequest.setAbdominalCircumference(abdominalGirth); - List list = JsonUtil.jkstr2Obj(fhr, List.class); - if (CollectionUtils.isNotEmpty(list)) { - List placentaList = new ArrayList<>(); - for (String l : list) { - MatDeliverAddRequest.Placenta placenta = new MatDeliverAddRequest.Placenta(); - placenta.setHeartRate(Double.parseDouble(l)); - placentaList.add(placenta); + if (value != null && "2".equals(value)) { + List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid)), 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()))) { + falg = false; + } + } + } + if (falg) { + //创建一条复诊记录 + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("type").is(1)), Patients.class); + if (null != patients) { + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), AntExChuModel.class); + if (null != antExChuModel) { + AntExAddRequest antExAddRequest = new AntExAddRequest(); + antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); + antExAddRequest.setCheckDoctor("1000000185"); + antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " + antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" + antExAddRequest.setGuide("个人卫生 受激素影响怀孕后肤质与孕前不一样，保养皮肤请做好日常清洁并避免使用刺激性的护肤品与保养品。" + + "心理调节 心理状态不佳更需家人陪伴与支持，可与丈夫一起上孕妇学校课程、或与丈夫携手散步、又或让丈夫给您进行甜蜜按摩。" + + "营养 虽然孕期体重增加过多会增加你的高血压和怀上巨大儿的可能性。但是也不要进入饮食的误区，靠节食来减缓体重增长的速度。" + + "正确的方法是，请医生给你一些均衡饮食的建议，使你能够达到孕期的标准体重。" + + "运动 骨盆底肌肉练习：从现在起，你可以开始做骨盆底肌肉练习了，这个运动可以帮助你分娩的更快、更容易。" + + "骨盆底肌肉练习的步骤是：收缩肛门、阴道，再放松。重复这个动作30次。" + + "其他 当宝贝活动较多的时候，可跟老公一起给宝贝读些优美的诗歌，享受一家人的幸福时光。"); + antExAddRequest.setParentId(patients.getId()); + antExAddRequest.setPid(pid); + antExAddRequest.setRiskFactor(patients.getRiskFactorId()); + antExAddRequest.setGongGao(fuh); + antExAddRequest.setAbdominalCircumference(abdominalGirth); + List list = JsonUtil.jkstr2Obj(fhr, List.class); + if (CollectionUtils.isNotEmpty(list)) { + List placentaList = new ArrayList<>(); + for (String l : list) { + MatDeliverAddRequest.Placenta placenta = new MatDeliverAddRequest.Placenta(); + placenta.setHeartRate(Double.parseDouble(l)); + placentaList.add(placenta); + } + antExAddRequest.setTireData(placentaList); + antExAddRequest.setTireNumber(list.size() + ""); } - antExAddRequest.setTireData(placentaList); - antExAddRequest.setTireNumber(list.size() + ""); + antenatalExaminationFacade.addOneAntEx(antExAddRequest, 1000000185); } - antenatalExaminationFacade.addOneAntEx(antExAddRequest, 1000000185); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 7d80d01..48b6bb1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -113,7 +113,7 @@ public class StopPregnancyFacade { patient.setFmDate(DateUtil.parseYMD(request.getStopDate())); yunBookbuildingService.updatePregnant(patient, patient.getId()); //终止妊娠生成追访信息 - addTrackDownInfo(patient.getOperator(),patient); + addTrackDownInfo(patient.getOperator(), patient); } } } @@ -181,7 +181,7 @@ public class StopPregnancyFacade { for (Patients patient : patients) { if (patient != null) { String hid = patient.getHospitalId(); - if (StringUtils.isNotEmpty(groupId) &&CollectionUtils.isNotEmpty(hos)&& hos.contains(hospital)) { + if (StringUtils.isNotEmpty(groupId) && CollectionUtils.isNotEmpty(hos) && hos.contains(hospital)) { pat = patient; } else if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId())) { pat = patient; @@ -191,8 +191,7 @@ public class StopPregnancyFacade { //终止妊娠状态 patient.setDueStatus(1); - if (patient.getServiceType() != null) - { + if (patient.getServiceType() != null) { //更新状态为过期 //判断其为增值服务还是 标准服务 if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) { @@ -208,7 +207,7 @@ public class StopPregnancyFacade { //分娩状态 0未终止妊娠 1终止妊娠 yunBookbuildingService.updatePregnant(patient, patient.getId()); //终止妊娠生成追访信息 - addTrackDownInfo(userId,patient); + addTrackDownInfo(userId, patient); } } @@ -250,6 +249,7 @@ public class StopPregnancyFacade { /** * 初诊、复诊添加或更新追访信息 + * * @param userId * @param patient */ @@ -268,15 +268,15 @@ public class StopPregnancyFacade { //当前孕妇是孕28周后，进入产后复查追访，否则结束流程 int dueWeek = DateUtil.getWeek2(patient.getLastMenses(), patient.getBookbuildingDate()); - if(dueWeek>=28){//进入产后复查 + if (dueWeek >= 28) {//进入产后复查 trackDownRecord.setTrackType(TrackDownDateEnums.F.getId()); //--终止妊娠后不显示追访 trackDownRecord.setStatus(1); - }else{//结束流程 + } else {//结束流程 //--终止妊娠后不显示追访 trackDownRecord.setStatus(0); } - trackDownService.addOrupdateTrackDownRecord(userId,trackDownRecord); + trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } private StopPregModel getStopPregModel(StopPregRequest request) { @@ -470,7 +470,7 @@ public class StopPregnancyFacade { usersQuery.setYn(YnEnums.YES.getId()); usersQuery.setOrgId(dbuser.getOrgId()); usersQuery.setEnable(1); - List lis =new ArrayList<>(); + List lis = new ArrayList<>(); lis.add(1); lis.add(2); lis.add(3); @@ -496,4 +496,34 @@ public class StopPregnancyFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + + /*** + * 小程序根据机构返回机构下所有医生列表 + * */ + + public BaseResponse queryInPerson3(Integer orgId) { + List list = new ArrayList<>(); + if (null != orgId) { + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setOrgId(orgId); + usersQuery.setEnable(1); + List users = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(users)) { + for (Users user : users) { + Map pmap = new HashMap(); + pmap.put("id", user.getId()); + pmap.put("name", user.getName()); + list.add(pmap); + } + } + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(list); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + }