diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAssessModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAssessModel.java new file mode 100644 index 0000000..a83b16c --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAssessModel.java @@ -0,0 +1,167 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * Created by Administrator on 2021-05-18. + */ +@Document(collection = "lyms_baby_assess") +public class BabyAssessModel extends BaseModel { + private String id; + //儿童id + private String babyId; + //重症识别 + private String zzsb; + //疾病治疗 + private String jbzl; + + //发育评估 + private String fypg; + + //口腔保健 + private String kqbj; + + //眼保健 + private String ybj; + + //耳保健 + private String ebj; + + //儿童保健 + private String etbj; + + //预防接种 + private String yfjz; + + //疾病的预防 + private String jbyf; + private Date created; + + private Date modified; + + private String operaterId; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + + public String getZzsb() { + return zzsb; + } + + public void setZzsb(String zzsb) { + this.zzsb = zzsb; + } + + public String getJbzl() { + return jbzl; + } + + public void setJbzl(String jbzl) { + this.jbzl = jbzl; + } + + public String getFypg() { + return fypg; + } + + public void setFypg(String fypg) { + this.fypg = fypg; + } + + public String getKqbj() { + return kqbj; + } + + public void setKqbj(String kqbj) { + this.kqbj = kqbj; + } + + public String getYbj() { + return ybj; + } + + public void setYbj(String ybj) { + this.ybj = ybj; + } + + public String getEbj() { + return ebj; + } + + public void setEbj(String ebj) { + this.ebj = ebj; + } + + public String getEtbj() { + return etbj; + } + + public void setEtbj(String etbj) { + this.etbj = etbj; + } + + public String getYfjz() { + return yfjz; + } + + public void setYfjz(String yfjz) { + this.yfjz = yfjz; + } + + public String getJbyf() { + return jbyf; + } + + public void setJbyf(String jbyf) { + this.jbyf = jbyf; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public String getOperaterId() { + return operaterId; + } + + public void setOperaterId(String operaterId) { + this.operaterId = operaterId; + } +} 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 ffbc4e7..3fa2958 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 @@ -207,6 +207,18 @@ public class MaternalDeliverModel extends BaseModel { private String streetRegisterId; private String inHospitalNo; + //产后复查评估 状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估 + + private List status; + + public List getStatus() { + return status; + } + + public void setStatus(List status) { + this.status = status; + } + public String getDoctorSign() { return doctorSign; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java index 64a2f59..52e41ec 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.List; /** * Created by Administrator on 2021-05-18. @@ -46,6 +47,11 @@ public class PostkfModel extends BaseModel { //保健预防 private String bjyf; + private String hospitalId; + + //产后复查评估 状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估 + + private List status; private Date created; @@ -54,6 +60,22 @@ public class PostkfModel extends BaseModel { private String operaterId; + public List getStatus() { + return status; + } + + public void setStatus(List status) { + this.status = status; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public Date getCreated() { return created; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java index bbb2c44..714ccde 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.PostkfFaccade; +import com.lyms.platform.pojo.BabyAssessModel; import com.lyms.platform.pojo.PostkfModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -20,6 +21,12 @@ public class PostkfController extends BaseController { @Autowired private PostkfFaccade postkfFaccade; + /** + * 添加产后康复表记录 + * @param request + * @param postkfModel + * @return + */ @TokenRequired @ResponseBody @RequestMapping(value = "/addPostKf", method = RequestMethod.POST) @@ -28,10 +35,44 @@ public class PostkfController extends BaseController { } + /** + * 查询产后康复表记录 + * @param request + * @param mid + * @return + */ @TokenRequired @ResponseBody @RequestMapping(value = "/getPostKf", method = RequestMethod.GET) public BaseResponse getPostKf(HttpServletRequest request,@RequestParam(required = true) String mid) { return postkfFaccade.getPostKf(mid, getUserId(request)); } + + + /** + * 添加儿童评估表 + * @param request + * @param babyAssessModel + * @return + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "/addBabyAssess", method = RequestMethod.POST) + public BaseResponse addBabyAssess(HttpServletRequest request,@RequestBody BabyAssessModel babyAssessModel) { + return postkfFaccade.addBabyAssess(babyAssessModel, getUserId(request)); + } + + + /** + * 查询儿童评估表 + * @param request + * @param mid + * @return + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "/getBabyAssess", method = RequestMethod.GET) + public BaseResponse getBabyAssess(HttpServletRequest request,@RequestParam(required = true) String mid) { + return postkfFaccade.getBabyAssess(mid, getUserId(request)); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java index 706c44a..1a80d61 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java @@ -1,12 +1,17 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.MatDeliverService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.MongoConvertHelper; import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.pojo.BabyAssessModel; +import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.PostkfModel; +import com.lyms.platform.query.MatDeliverQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -26,8 +31,24 @@ public class PostkfFaccade { @Autowired private MongoTemplate mongoTemplate; + @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired + private MatDeliverService matDeliverService; public BaseResponse addPostKf(PostkfModel postkfModel, Integer userId) { + + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setId(postkfModel.getMid()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + List list2 = matDeliverService.query(matDeliverQuery); + if (CollectionUtils.isNotEmpty(list2)) + { + MaternalDeliverModel maternalDeliverModel = list2.get(0); + maternalDeliverModel.setStatus(postkfModel.getStatus()); + matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId()); + } if (StringUtils.isNotEmpty(postkfModel.getId())) { postkfModel.setModified(new Date()); @@ -37,6 +58,8 @@ public class PostkfFaccade { mongoTemplate.updateFirst(query, update, PostkfModel.class); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + String hospitalId = autoMatchFacade.getHospitalId(userId); + postkfModel.setHospitalId(hospitalId); postkfModel.setOperaterId(String.valueOf(userId)); postkfModel.setCreated(new Date()); postkfModel.setModified(new Date()); @@ -47,6 +70,33 @@ public class PostkfFaccade { public BaseResponse getPostKf(String mid, Integer userId) { List postkfModels = mongoTemplate.find(Query.query(Criteria.where("mid"). is(mid)), PostkfModel.class); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(CollectionUtils.isNotEmpty(postkfModels) ? postkfModels.get(0) : null); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(CollectionUtils.isNotEmpty(postkfModels) ? postkfModels.get(0) : null); + } + + public BaseResponse addBabyAssess(BabyAssessModel babyAssessModel, Integer userId) { + if (StringUtils.isNotEmpty(babyAssessModel.getId())) + { + babyAssessModel.setModified(new Date()); + Query query = Query.query(Criteria.where("_id").is(babyAssessModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(babyAssessModel)); + mongoTemplate.updateFirst(query, update, BabyAssessModel.class); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + String hospitalId = autoMatchFacade.getHospitalId(userId); + babyAssessModel.setHospitalId(hospitalId); + babyAssessModel.setOperaterId(String.valueOf(userId)); + babyAssessModel.setCreated(new Date()); + babyAssessModel.setModified(new Date()); + mongoTemplate.save(babyAssessModel); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + + public BaseResponse getBabyAssess(String babyId, Integer userId) { + List babyAssessModels = mongoTemplate.find(Query.query(Criteria.where("babyId"). + is(babyId)), BabyAssessModel.class); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(CollectionUtils.isNotEmpty(babyAssessModels) + ? babyAssessModels.get(0) : null); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 3929d91..c525667 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -182,6 +182,27 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { private String gcStatus;//观察状态(0:正在观察；1:观察完成) + //评估类型 1 应评估 2 已评估 + private Integer type; + //评估状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估 + private Integer status; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public String getGcStatus() { return gcStatus; }