diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveRecordController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveRecordController.java index 4fd9687..f5952a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveRecordController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveRecordController.java @@ -157,4 +157,17 @@ public class SieveRecordController extends BaseController { } + /** + * 获取编辑数据 + * @param id + * @return + */ + @RequestMapping(value = "/getSieveEditPatient", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse getSieveEditPatient(@RequestParam("id") String id) { + return sieveRecordFacade.getSieveEditPatient(id); + } + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index cb82c7e..e4a2825 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1215,7 +1215,7 @@ public class BookbuildingFacade { } - private PregnantInfoResult getResult(Patients p) { + public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); result.setMensStartDay(p.getMensStartDay()); result.setMensEndDay(p.getMensEndDay()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java index 43851c7..68178f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java @@ -15,6 +15,7 @@ import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest; import com.lyms.platform.operate.web.request.CqSieveQueryRequest; import com.lyms.platform.operate.web.request.SieveAddRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; +import com.lyms.platform.operate.web.result.PregnantInfoResult; import com.lyms.platform.operate.web.result.SieveDetailResult; import com.lyms.platform.operate.web.result.SieveListResult; import com.lyms.platform.operate.web.result.SieveResult; @@ -81,8 +82,17 @@ public class SieveRecordFacade { public BaseResponse saveSieveRecord(YunBookbuildingAddRequest requestModel, Integer userId) { try { SieveRecordModel model = getPatientsData(requestModel); - model.setOperUserId(userId); - sieveRecordService.save(model); + //id不为空就修改记录 + if (StringUtils.isNotEmpty(requestModel.getId())) + { + sieveRecordService.update(model,requestModel.getId()); + } + else + { + model.setOperUserId(userId); + sieveRecordService.save(model); + } + } catch (Exception e) { @@ -382,4 +392,23 @@ public class SieveRecordFacade { br.setErrormsg("成功"); return br; } + + public BaseObjectResponse getSieveEditPatient(String id) { + SieveRecordQuery query = new SieveRecordQuery(); + query.setYn(YnEnums.YES.getId()); + query.setId(id); + query.setStatus(0); + PregnantInfoResult result = new PregnantInfoResult(); + List list = sieveRecordService.query(query); + if (list != null && list.size() > 0) { + Patients p = list.get(0); + result = bookbuildingFacade.getResult(p); + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 5d47e91..66c5df7 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -1,6 +1,6 @@ #短信中心url -#center_base_url=http://sms.healthbaby.com.cn/v1/ -center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/ +#center_base_url=https://weixin-push-save.healthbaby.com.cn +center_base_url=https://push.stage.platform.healthbaby.com.cn #德州代金券地址 djq_url=http://127.0.0.1:9090/his/insertDzfyDjq