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 new file mode 100644 index 0000000..c370f0b --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -0,0 +1,322 @@ +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 2016/6/28 0028. + */ +@Document(collection = "lyms_postreview") +public class PostReviewModel extends BaseModel { + private String id; + //产妇id + private String parentId; + + //分娩天数 + private String day; + //健康情况 + private String healthStatus; + //心理状态 + private String psychology; + //体重 + private double weight; + //血压 + private String bp; + /** + * 乳房 + */ + private String breast; + /** + * 恶露 + */ + private String lochia; + /** + * 外阴 + */ + private String vulva; + /** + * 阴道 + */ + private String vagina; + //宫颈 + private String cervixUteri; + /** + * 子宫 + */ + private String matrix; + + /** + * 伤口 + */ + private String wound; + /** + * 其他 + */ + private String other; + //附件 + private String fujian; + + //-----------------辅助检查--------------------- + //盆地检查 + private String basin; + //微量元素检查 + private String traceElement; + //骨密度检查 + private String boneDensity; + //超声检查 + private String ultrasonicExamination; + // 诊断 + private String diagnosis; + //处理意见 + private String treatOpinion; + + //指导意见 + private String dirOpinion; + //产检 医生 + private String prodDoctor; + //产检日期 + private String checkTime; + //下次产检时间 + private String nextCheckTime; + + private Integer yn; + private Date created; + private Date modified; + + public String getBasin() { + return basin; + } + + public void setBasin(String basin) { + this.basin = basin; + } + + public String getBoneDensity() { + return boneDensity; + } + + public void setBoneDensity(String boneDensity) { + this.boneDensity = boneDensity; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public String getDiagnosis() { + return diagnosis; + } + + public void setDiagnosis(String diagnosis) { + this.diagnosis = diagnosis; + } + + public String getDirOpinion() { + return dirOpinion; + } + + public void setDirOpinion(String dirOpinion) { + this.dirOpinion = dirOpinion; + } + + public String getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(String nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } + + public String getProdDoctor() { + return prodDoctor; + } + + public void setProdDoctor(String prodDoctor) { + this.prodDoctor = prodDoctor; + } + + public String getTraceElement() { + return traceElement; + } + + public void setTraceElement(String traceElement) { + this.traceElement = traceElement; + } + + public String getTreatOpinion() { + return treatOpinion; + } + + public void setTreatOpinion(String treatOpinion) { + this.treatOpinion = treatOpinion; + } + + public String getUltrasonicExamination() { + return ultrasonicExamination; + } + + public void setUltrasonicExamination(String ultrasonicExamination) { + this.ultrasonicExamination = ultrasonicExamination; + } + + 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; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getBp() { + return bp; + } + + public void setBp(String bp) { + this.bp = bp; + } + + public String getBreast() { + return breast; + } + + public void setBreast(String breast) { + this.breast = breast; + } + + public String getCervixUteri() { + return cervixUteri; + } + + public void setCervixUteri(String cervixUteri) { + this.cervixUteri = cervixUteri; + } + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } + + public String getFujian() { + return fujian; + } + + public void setFujian(String fujian) { + this.fujian = fujian; + } + + public String getHealthStatus() { + return healthStatus; + } + + public void setHealthStatus(String healthStatus) { + this.healthStatus = healthStatus; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLochia() { + return lochia; + } + + public void setLochia(String lochia) { + this.lochia = lochia; + } + + public String getMatrix() { + return matrix; + } + + public void setMatrix(String matrix) { + this.matrix = matrix; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getPsychology() { + return psychology; + } + + public void setPsychology(String psychology) { + this.psychology = psychology; + } + + public String getVagina() { + return vagina; + } + + public void setVagina(String vagina) { + this.vagina = vagina; + } + + public String getVulva() { + return vulva; + } + + public void setVulva(String vulva) { + this.vulva = vulva; + } + + public double getWeight() { + return weight; + } + + public void setWeight(double weight) { + this.weight = weight; + } + + public String getWound() { + return wound; + } + + public void setWound(String wound) { + this.wound = wound; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java new file mode 100644 index 0000000..6026d94 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java @@ -0,0 +1,55 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; + +/** + * Created by Administrator on 2016/6/28 0028. + */ +public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery { + private String id; + private String parentId; + private Integer yn; + + 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 Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition mongoCondition=MongoCondition.newInstance(); + if(null!=yn){ + mongoCondition= mongoCondition.and("yn",yn, MongoOper.IS); + } + if(null!=id){ + mongoCondition= mongoCondition.and("id",id, MongoOper.IS); + } + if(null!=parentId){ + mongoCondition= mongoCondition.and("parentId",parentId, MongoOper.IS); + } + return mongoCondition.toMongoQuery(); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java index 1d03c2c..e010a3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java @@ -48,7 +48,7 @@ public class ApplyOrderController extends BaseController { @TokenRequired public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest,loginState.getId()); + return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest, loginState.getId()); } @RequestMapping(method = RequestMethod.POST,value = "/sieveapply") @@ -78,6 +78,12 @@ public class ApplyOrderController extends BaseController { @TokenRequired public BaseResponse queryApplyOrder(@Valid ApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return applyOrderFacade.queryApplyOrder(orderQueryRequest,loginState.getId()); + return applyOrderFacade.queryApplyOrder(orderQueryRequest, loginState.getId()); + } + + @RequestMapping(method = RequestMethod.GET,value = "/applyorderEnums") + @ResponseBody + public BaseResponse getEnums(){ + return applyOrderFacade.getEnums(); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 8261fb1..7d70da6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -3,15 +3,14 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.ApplyOrderService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; import com.lyms.platform.operate.web.result.ApplyOrderOutResult; -import com.lyms.platform.permission.model.Organization; -import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.ReferralApplyOrderModel; import com.lyms.platform.pojo.SieveApplyOrderModel; @@ -22,9 +21,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by Administrator on 2016/6/15 0015. @@ -37,6 +34,8 @@ public class ApplyOrderFacade { private PatientsService patientsService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private BasicConfigFacade basicConfigFacade; /** * 增加转诊申请 @@ -44,20 +43,20 @@ public class ApplyOrderFacade { * @param referralApplyOrderAddRequest * @return */ - public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest,Integer userId) { + public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId) { ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel(); referralApplyOrderModel.setCreated(new Date()); referralApplyOrderModel.setStatus(0); - PatientsQuery patientsQuery=new PatientsQuery(); + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(referralApplyOrderModel.getParentId()); //查询产妇信息 List patientses = patientsService.queryPatient(patientsQuery); - Patients patients=null; - if(CollectionUtils.isNotEmpty(patientses)){ - patients= patientses.get(0); + Patients patients = null; + if (CollectionUtils.isNotEmpty(patientses)) { + patients = patientses.get(0); } - if(null!=patients){ + if (null != patients) { referralApplyOrderModel.setCardNo(patients.getCardNo()); referralApplyOrderModel.setAge(patients.getAge()); referralApplyOrderModel.setDueDate(patients.getDueDate()); @@ -65,7 +64,7 @@ public class ApplyOrderFacade { } List areaId = autoMatchFacade.matchOrgId(userId); - referralApplyOrderModel.setOutHospitalId(areaId.get(0)+""); + referralApplyOrderModel.setOutHospitalId(areaId.get(0) + ""); applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -104,8 +103,8 @@ public class ApplyOrderFacade { * @return */ public BaseListResponse querySieveApplyOrder(String id) { - SieveApplyOrderQuery sieveApplyOrderQuery =new SieveApplyOrderQuery(); - List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -115,8 +114,8 @@ public class ApplyOrderFacade { * @param applyOrderQueryRequest * @return */ - public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest,Integer userId){ - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge()); referralApplyOrderQuery.setDueWeek(applyOrderQueryRequest.getDueWeek()); @@ -127,19 +126,19 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage()); referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); //1 转入 0转出 - if("1".equals(applyOrderQueryRequest.getType())){ + if ("1".equals(applyOrderQueryRequest.getType())) { List data = autoMatchFacade.matchOrgId(userId); - referralApplyOrderQuery.setTransferredHospital(data.get(0)+""); - }else if("0".equals(applyOrderQueryRequest.getType())){ + referralApplyOrderQuery.setTransferredHospital(data.get(0) + ""); + } else if ("0".equals(applyOrderQueryRequest.getType())) { List data = autoMatchFacade.matchOrgId(userId); - referralApplyOrderQuery.setOutHospitalId(data.get(0)+""); + referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); List data = new ArrayList(); - if(CollectionUtils.isNotEmpty(orderModels)){ - for(ReferralApplyOrderModel orderModel:orderModels){ - ApplyOrderOutResult applyOrderResult=new ApplyOrderOutResult(); + if (CollectionUtils.isNotEmpty(orderModels)) { + for (ReferralApplyOrderModel orderModel : orderModels) { + ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult(); applyOrderResult.convertToResult(orderModel); data.add(applyOrderResult); } @@ -147,4 +146,15 @@ public class ApplyOrderFacade { return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseResponse getEnums() { + Map map = new HashMap<>(); + map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.GWFZ)); + List list = new ArrayList(); + list.add(5); + list.add(10); + list.add(15); + list.add(20); + map.put("score", list); + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java index 0920d47..05dad4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java @@ -35,7 +35,7 @@ public class ApplyOrderInResult implements IBasicResultConvert