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 5d5ce4d..0485241 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 @@ -85,6 +85,15 @@ public class AntExChuModel implements Serializable { //附件 private String fujian; private Date created; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public String getCervical() { return cervical; 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 37fe059..d3a0f76 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 @@ -89,6 +89,16 @@ public class AntenatalExaminationModel { private Integer yn; private Date created; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getTypeYc() { return typeYc; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 46adb5f..a6f0bfd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -97,6 +97,15 @@ public class MaternalDeliverModel { private Integer yn; private Date created; private Date modified; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public Date getCreated() { return created; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java index c370f0b..a97aa26 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -87,6 +87,15 @@ public class PostReviewModel extends BaseModel { private Integer yn; private Date created; private Date modified; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public String getBasin() { return basin; 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 39e889d..5dfcf9a 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 @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; @@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; /** @@ -49,8 +52,10 @@ public class AntenatalExaminationController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/antexmanage") @ResponseBody - public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest) { - return antenatalExaminationFacade.addOneAntEx(antExAddRequest); + @TokenRequired + public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.addOneAntEx(antExAddRequest,loginState.getId()); } /** @@ -61,8 +66,10 @@ public class AntenatalExaminationController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/antex") @ResponseBody - public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest) { - return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest); + @TokenRequired + public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index f9a1a8c..e51ed8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.MatDeliverFacade; @@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; /** @@ -47,8 +50,10 @@ public class MatDeliverController extends BaseController{ */ @RequestMapping(value = "/matdel",method = RequestMethod.POST) @ResponseBody - public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest){ - return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest); + @TokenRequired + public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest,loginState.getId()); } /** * 删除一条删除记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 2924e15..06ecf20 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -49,6 +49,8 @@ public class AntenatalExaminationFacade { private MatDeliverService matDeliverService; @Autowired private PostReviewService postReviewService; + @Autowired + private AutoMatchFacade autoMatchFacade; /** * 增加一条产前检查 @@ -56,14 +58,19 @@ public class AntenatalExaminationFacade { * @param antExAddRequest * @return */ - public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest) { + public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest,Integer userId) { if (StringUtils.isNotEmpty(antExAddRequest.getId())) { AntenatalExaminationModel antenatalExamination = antExAddRequest.convertToDataModel(); + antenatalExamination.setHospitalId(autoMatchFacade.matchOrgId(userId).get(0)+""); antenatalExaminationService.updateOneAnt(antenatalExamination, antExAddRequest.getId()); updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); + List list1 = autoMatchFacade.matchOrgId(userId); + if(CollectionUtils.isNotEmpty(list1)){ + model.setHospitalId(list1.get(0)+""); + } antenatalExaminationService.addOneBabyAnt(model); updateApplyOrder(model, antExAddRequest.getParentId()); } @@ -93,11 +100,15 @@ public class AntenatalExaminationFacade { * @param excAddRequest * @return */ - public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest) { + public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest,Integer userId) { AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); } else { + List list1 = autoMatchFacade.matchOrgId(userId); + if(CollectionUtils.isNotEmpty(list1)){ + antExChuModel.setHospitalId(list1.get(0)+""); + } antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); } @@ -128,7 +139,8 @@ public class AntenatalExaminationFacade { matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setParentId(patients.getId()); //建档记录 - data.add(new AntData(patients)); + Organization organization = organizationService.getOrganization(patients.getHospitalId()); + data.add(new AntData(patients, null != organization ? organization.getName() : "")); //分娩记录 List modelList = matDeliverService.query(matDeliverQuery); String dueDate = ""; @@ -148,7 +160,8 @@ public class AntenatalExaminationFacade { List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel an : antExChuModels) { - data.add(new AntData(an)); + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + data.add(new AntData(an,null != organization ? organization.getName() : "")); } } //复诊记录 @@ -160,12 +173,13 @@ public class AntenatalExaminationFacade { List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list1)) { for (AntenatalExaminationModel an : list1) { - data.add(new AntData(an)); + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); + data.add(new AntData(an,null != organization ? organization.getName() : "")); } } postReviewQuery = new PostReviewQuery(); postReviewQuery.setYn(YnEnums.YES.getId()); - if(list.size() - 1 > i){ + if (list.size() - 1 > i) { postReviewQuery.setStart(date); //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 // postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); @@ -177,13 +191,15 @@ public class AntenatalExaminationFacade { i++; //分娩记录 if (CollectionUtils.isNotEmpty(modelList)) { - data.add(new AntData(modelList.get(0), patients.getLastMenses())); + organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId())); + data.add(new AntData(modelList.get(0), patients.getLastMenses(),null != organization ? organization.getName() : "")); } //产后复查记录 List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { for (PostReviewModel postReviewModel : reviewModels) { - data.add(new AntData(postReviewModel)); + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + data.add(new AntData(postReviewModel,null != organization ? organization.getName() : "")); } } listDate.add(data); @@ -330,13 +346,13 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setDiagnosis(queryRisk(list)); } catch (Exception e) { } - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(examinationModel.getParentId()); antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); - SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery(); + SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery(); applyOrderQuery.setParentId(examinationModel.getParentId()); applyOrderQuery.setYn(YnEnums.YES.getId()); - antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1); + antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); object = antenatalExaminationResult; } else { //查询初诊数据 @@ -360,13 +376,13 @@ public class AntenatalExaminationFacade { antexChuResult.setHighrisk(queryRisk(list1)); } catch (Exception e) { } - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(antExChuModel.getParentId()); antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); - SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery(); + SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery(); applyOrderQuery.setParentId(antExChuModel.getParentId()); applyOrderQuery.setYn(YnEnums.YES.getId()); - antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1); + antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); object = antexChuResult; } 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 70a2ea8..ce3dca0 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 @@ -47,6 +47,8 @@ public class MatDeliverFacade { private AntenatalExaminationService antenatalExaminationService; @Autowired private BasicConfigService basicConfigService; + @Autowired + private AutoMatchFacade autoMatchFacade; /** @@ -55,7 +57,7 @@ public class MatDeliverFacade { * @param deliverAddRequest * @return */ - public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest) { + public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest,Integer userId) { //增加 if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); @@ -86,7 +88,10 @@ public class MatDeliverFacade { babyIds.add(babyService.addOneBaby(babyModel).getId()); } } - + List list1 = autoMatchFacade.matchOrgId(userId); + if(CollectionUtils.isNotEmpty(list1)){ + maternalDeliverModel.setHospitalId(list1.get(0)+""); + } maternalDeliverModel.setBaby(babyIds); maternalDeliverModel.setYn(YnEnums.YES.getId()); matDeliverService.addMatDeliver(maternalDeliverModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 05b4b45..cccb309 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -39,10 +39,18 @@ public class PostReviewFacade { private PatientsService patientsService; @Autowired private MatDeliverService matDeliverService; + @Autowired + private AutoMatchFacade autoMatchFacade; - public BaseResponse addPostReview(PostReviewRequest postReviewRequest) { + public BaseResponse addPostReview(PostReviewRequest postReviewRequest,Integer userId) { if (StringUtils.isEmpty(postReviewRequest.getId())) { - postReviewService.addPostReview(postReviewRequest.convertToDataModel()); + PostReviewModel postReviewModel = postReviewRequest.convertToDataModel(); + postReviewModel.setYn(YnEnums.YES.getId()); + List list1 = autoMatchFacade.matchOrgId(userId); + if(CollectionUtils.isNotEmpty(list1)){ + postReviewModel.setHospitalId(list1.get(0)+""); + } + postReviewService.addPostReview(postReviewModel); } else { postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java index 8c0eb32..e19ea6f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -13,6 +13,25 @@ public class AntData { //1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查 private String type; + private String hospitalName; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + public String getType() { return type; } @@ -29,15 +48,17 @@ public class AntData { this.title = title; } - public AntData(AntenatalExaminationModel model) { + public AntData(AntenatalExaminationModel model,String hospitalName) { this.id = model.getId(); this.dueWeek = model.getCurrentDueDate(); this.checkTime = model.getCheckDate(); this.title="复诊"; this.type="3"; + this.hospitalName=hospitalName; + this.hospitalId=model.getHospitalId(); } - public AntData(AntExChuModel model) { + public AntData(AntExChuModel model,String hospitalName) { this.id = model.getId(); int days = DateUtil.daysBetween(model.getLastMenses(), new Date()); String week = (days / 7) + ""; @@ -46,9 +67,11 @@ public class AntData { this.checkTime = model.getCheckTime(); this.title="初诊"; this.type="2"; + this.hospitalName=hospitalName; + this.hospitalId=model.getHospitalId(); } - public AntData(Patients model) { + public AntData(Patients model,String hospitalName) { this.id = model.getId(); int days = DateUtil.daysBetween(model.getLastMenses(), new Date()); String week = (days / 7) + ""; @@ -57,9 +80,11 @@ public class AntData { this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated()); this.title="孕妇建档"; this.type="1"; + this.hospitalName=hospitalName; + this.hospitalId=model.getHospitalId()+""; } - public AntData(MaternalDeliverModel model,Date lastMenses) { + public AntData(MaternalDeliverModel model,Date lastMenses,String hospitalName) { this.id = model.getId(); int days = DateUtil.daysBetween(lastMenses,model.getCreated()); String week = (days / 7) + ""; @@ -68,14 +93,18 @@ public class AntData { this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated()); this.title="孕妇分娩"; this.type="4"; + this.hospitalName=hospitalName; + this.hospitalId=model.getHospitalId(); } - public AntData(PostReviewModel postReviewModel) { + public AntData(PostReviewModel postReviewModel,String hospitalName) { this.id=postReviewModel.getId(); this.dueWeek=postReviewModel.getDay(); this.checkTime=postReviewModel.getCheckTime(); this.title="产后复查"; this.type="5"; + this.hospitalName=hospitalName; + this.hospitalId=postReviewModel.getHospitalId(); } public String getCheckTime() {