diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExHighRiskModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExHighRiskModel.java new file mode 100644 index 0000000..7557aae --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExHighRiskModel.java @@ -0,0 +1,234 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +@Document(collection = "lyms_antexhighrisk") +@JsonIgnoreProperties(ignoreUnknown = true) +public class AntExHighRiskModel { + private static final long serialVersionUID = SerialIdEnum.Patients.getCid(); + private String id; + private String hospitalId; + private Integer yn; + + private String parentId; + //测量日期 + private String checkTime; + //盆骨测量情况(间距，cm) + private String pelvic; + //入口:骶耻外径 + @JsonProperty(value = "EC") + private String EC; + //出口:坐骨结节间经 + @JsonProperty(value = "TO") + private String TO; + //中骨盆坐骨棘 + private String ischialSpine; + //前后经 + private String qianhoujing; + //切迹宽 + private String qiejikuan; + //后失状径 + private String hszhuangjing; + //前后经 + private String qianhoujing2; + //耻骨弓 + private String chigugong; + //侧壁 + private String cebi; + //骶骨 + private String digu; + //其他 + private String other; + //诊断 + private String diagnose; + //诊断时间 + private String diagnoseTime; + //签名 + private String signature; + + private Date modified; + + private Date created; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getPelvic() { + return pelvic; + } + + public void setPelvic(String pelvic) { + this.pelvic = pelvic; + } + + public String getEC() { + return EC; + } + + public void setEC(String EC) { + this.EC = EC; + } + + public String getTO() { + return TO; + } + + public void setTO(String TO) { + this.TO = TO; + } + + public String getIschialSpine() { + return ischialSpine; + } + + public void setIschialSpine(String ischialSpine) { + this.ischialSpine = ischialSpine; + } + + public String getQianhoujing() { + return qianhoujing; + } + + public void setQianhoujing(String qianhoujing) { + this.qianhoujing = qianhoujing; + } + + public String getQiejikuan() { + return qiejikuan; + } + + public void setQiejikuan(String qiejikuan) { + this.qiejikuan = qiejikuan; + } + + public String getHszhuangjing() { + return hszhuangjing; + } + + public void setHszhuangjing(String hszhuangjing) { + this.hszhuangjing = hszhuangjing; + } + + public String getQianhoujing2() { + return qianhoujing2; + } + + public void setQianhoujing2(String qianhoujing2) { + this.qianhoujing2 = qianhoujing2; + } + + public String getChigugong() { + return chigugong; + } + + public void setChigugong(String chigugong) { + this.chigugong = chigugong; + } + + public String getCebi() { + return cebi; + } + + public void setCebi(String cebi) { + this.cebi = cebi; + } + + public String getDigu() { + return digu; + } + + public void setDigu(String digu) { + this.digu = digu; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + + public String getDiagnoseTime() { + return diagnoseTime; + } + + public void setDiagnoseTime(String diagnoseTime) { + this.diagnoseTime = diagnoseTime; + } + + public String getSignature() { + return signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DiagnoseConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DiagnoseConfigQuery.java index 5a02683..55e0709 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/DiagnoseConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/DiagnoseConfigQuery.java @@ -19,7 +19,7 @@ public class DiagnoseConfigQuery extends BaseQuery implements IConvertToNativeQu private String id; private String hospitalId; //是否启用 0停用 1启用 - private Integer enable; + private String enable; //默认是孕妇类型，type=2是儿童类型 private String type; private boolean typeb; @@ -77,11 +77,11 @@ public class DiagnoseConfigQuery extends BaseQuery implements IConvertToNativeQu this.id = id; } - public Integer getEnable() { + public String getEnable() { return enable; } - public void setEnable(Integer enable) { + public void setEnable(String enable) { this.enable = enable; } 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 d3f5dd0..0b8b561 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 @@ -24,6 +24,7 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.AntExHighRiskModel; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -659,4 +660,31 @@ public class AntenatalExaminationController extends BaseController { return antenatalExaminationFacade.antexCheckCount(checkTime,loginState.getId()); } + /** + * 增加产检高危手册（大同） + * @param antExHighRiskModel + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addAntexHighRisk") + @ResponseBody + @TokenRequired + public BaseResponse addAntexHighRisk(@RequestBody AntExHighRiskModel antExHighRiskModel, HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.addAntexHighRisk(antExHighRiskModel,loginState.getId()); + } + + /** + * 查询产检高危手册（大同） + * @param parentId + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryAntexHighRisk") + @ResponseBody + @TokenRequired + public BaseResponse queryAntexHighRisk(@RequestParam String parentId,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.queryAntexHighRisk(parentId,loginState.getId()); + } } \ No newline at end of file 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 763f8dc..fdffbf7 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 @@ -4130,7 +4130,7 @@ public class AntenatalExaminationFacade { antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId)); DiagnoseConfigQuery diagnoseConfigQuery = new DiagnoseConfigQuery(); diagnoseConfigQuery.setHospitalId(hospitalId); - diagnoseConfigQuery.setEnable(1); + diagnoseConfigQuery.setEnable("1"); List configModels = diagnoseConfigService.queryDiagnoseConfigs(diagnoseConfigQuery); if (CollectionUtils.isNotEmpty(configModels) && StringUtils.isNotEmpty(configModels.get(0).getEnable())) { antexListResult.setEnableConfig(configModels.get(0).getEnable()); @@ -6628,4 +6628,32 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); } + public BaseResponse addAntexHighRisk(AntExHighRiskModel antExHighRiskModel,Integer userId){ + String hospitalId = autoMatchFacade.getHospitalId(userId); + antExHighRiskModel.setYn(1); + antExHighRiskModel.setHospitalId(hospitalId); + if (antExHighRiskModel.getId()!=null){ + antExHighRiskModel.setModified(new Date()); + Query updateQuery = Query.query(Criteria.where("_id").is(antExHighRiskModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(antExHighRiskModel)); + mongoTemplate.updateFirst(updateQuery, update, AntExHighRiskModel.class); + + }else { + antExHighRiskModel.setCreated(new Date()); + antExHighRiskModel.setModified(new Date()); + mongoTemplate.insert(antExHighRiskModel); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse queryAntexHighRisk(String parentId,Integer userId){ + String hospitalId = autoMatchFacade.getHospitalId(userId); + List antExHighRiskModels= mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId).and("yn").is(1)), AntExHighRiskModel.class); + + AntExHighRiskModel antExHighRiskModel= CollectionUtils.isNotEmpty(antExHighRiskModels)?antExHighRiskModels.get(0):null; + BaseResponse baseResponse= new BaseResponse(); + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setObject(antExHighRiskModel); + return baseResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 16eeaf7..4a75780 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1634,7 +1634,8 @@ public class PatientFacade extends BaseServiceImpl { Criteria criteria10 = Criteria.where("name").is("丙肝阳性"); Criteria criteria11 = Criteria.where("name").is("乙肝大三阳"); Criteria criteria12 = Criteria.where("name").is("乙肝小三阳"); - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12)); + Criteria criteria13=Criteria.where("name").is("所有妊娠合井传染性疾病--如病毒性肝炎、梅毒、HV感染及艾滋病、结核病、重症盛染性肺炎、特殊病毒感染(H1N7、寨卡等)"); + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4,criteria5,criteria6,criteria7,criteria8,criteria9,criteria10,criteria11,criteria12,criteria13)); } List models = mongoTemplate.find(yn, BasicConfig.class); List rFactorList = new ArrayList <>(); @@ -1747,6 +1748,8 @@ public class PatientFacade extends BaseServiceImpl { PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); patientsQuery.setHospitalId(hospital); patientsQuery.setNeed(needPage); + patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); + patientsQuery.setPage(riskPatientsQueryRequest.getPage()); //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start();