diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index 7e2b92b..623ff0f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -69,4 +69,6 @@ public interface CouponService{ * @return */ int getUserCouponCanUseCount(String userId); + + BaseObjectResponse use1(String hospitalId, String code, String userId, String usedId); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 276bf63..e15f03e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -856,6 +856,19 @@ public class CouponServiceImpl implements CouponService { } @Override + public BaseObjectResponse use1(String hospitalId, String code, String userId, String usedId) { + Map param = new HashMap<>(); + param.put("hospitalId", hospitalId); + param.put("operatorUseId", userId); + param.put("status", 2); + param.put("useDate", new Date()); + param.put("code", code); + param.put("usedId", usedId); + couponMapper.use(param); + return RespBuilder.buildSuccess(); + } + + @Override public Set findTypes(String hospital) { Map param = new HashMap<>(); param.put("hospitalId", hospital); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index ddf6195..a2298a3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -309,6 +309,8 @@ public class BabyEyeCheck extends BaseModel { * 泪器 */ private String lacrimalApparatus; + //晶状体 + private String lens; // private String lacrimalApparatusYang; @@ -442,6 +444,14 @@ public class BabyEyeCheck extends BaseModel { private Integer kindergarten;//2：幼儿园转诊--幼儿园机构 private Integer basicOrganization;//3:基层转诊--基层机构 + public String getLens() { + return lens; + } + + public void setLens(String lens) { + this.lens = lens; + } + public String getBabySource() { return babySource; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java index f4f5841..1d51b25 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java @@ -97,7 +97,12 @@ public class BabyKindergartenCheckModel extends BaseModel { private String wszq; //脊柱及四肢 private String jzjsz; - + //色觉检查 + private String sjjc; + //双眼视觉 + private String sysj; + //眼位 + private String yw; //眼左: private String leftEye; //眼右: @@ -168,6 +173,30 @@ public class BabyKindergartenCheckModel extends BaseModel { //脊柱及四肢-其他 private String jzjszQt; + public String getSjjc() { + return sjjc; + } + + public void setSjjc(String sjjc) { + this.sjjc = sjjc; + } + + public String getSysj() { + return sysj; + } + + public void setSysj(String sysj) { + this.sysj = sysj; + } + + public String getYw() { + return yw; + } + + public void setYw(String yw) { + this.yw = yw; + } + public String getJzjszQt() { return jzjszQt; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index d596159..14f759a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -132,7 +132,7 @@ public class Patients extends BaseModel { private String hprovinceRegisterId; private String hcityRegisterId; private String hareaRegisterId; - private String hstreetRegisterId; + private String hstreetRegisterId; /** * 丈夫居住地 */ @@ -153,6 +153,7 @@ public class Patients extends BaseModel { private String cityId; private String areaId; private String streetId; + private String villageId; //服务状态 private Integer serviceStatus; @@ -166,7 +167,8 @@ public class Patients extends BaseModel { //备注 private String mremark; - + //随访医生 丰宁需求 + private String booksuifangDoctor; /** * 产后休养地 @@ -485,6 +487,22 @@ public class Patients extends BaseModel { private String buildingManualCode; private Integer isComplete; + public String getVillageId() { + return villageId; + } + + public void setVillageId(String villageId) { + this.villageId = villageId; + } + + public String getBooksuifangDoctor() { + return booksuifangDoctor; + } + + public void setBooksuifangDoctor(String booksuifangDoctor) { + this.booksuifangDoctor = booksuifangDoctor; + } + public Integer getIsComplete() { return isComplete; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java index 6b8fe9d..d36f615 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java @@ -31,5 +31,107 @@ public class TeamRecordUpdateModel extends BaseModel { private Date startTime;//开始时间 private Date endTime;//开始时间 + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + public String getPatientName() { + return patientName; + } + + public void setPatientName(String patientName) { + this.patientName = patientName; + } + + public Integer getPatientAge() { + return patientAge; + } + + public void setPatientAge(Integer patientAge) { + this.patientAge = patientAge; + } + + public String getPatientPhone() { + return patientPhone; + } + + public void setPatientPhone(String patientPhone) { + this.patientPhone = patientPhone; + } + + public String getPatientGestation() { + return patientGestation; + } + + public void setPatientGestation(String patientGestation) { + this.patientGestation = patientGestation; + } + + public Date getPatientDueDate() { + return patientDueDate; + } + + public void setPatientDueDate(Date patientDueDate) { + this.patientDueDate = patientDueDate; + } + + public String getDoctorName() { + return doctorName; + } + + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; + } + + public String getOldTeamName() { + return oldTeamName; + } + + public void setOldTeamName(String oldTeamName) { + this.oldTeamName = oldTeamName; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public String getUpdateCause() { + return updateCause; + } + + public void setUpdateCause(String updateCause) { + this.updateCause = updateCause; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 0e1b400..26f008e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -436,6 +436,213 @@ public class BabyBuildController extends BaseController { return babyBookbuildingFacade.queryBabyList(request, loginState.getId()); } + + /** + * 查询儿童丰宁需求管理页面 + * + * @param mcardNo 母亲身份证 + * @param page + * @param limit + * param endCase 0未结案 1已结案 + * @param name 儿童姓名 + * @param highRiskType 0 非高危 1 高危 2、全部 3、体弱儿列表 4临时档案列表 + * @return + */ + @RequestMapping(value = "/queryFNEndCaseBabyList", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseListResponse queryFNEndCaseBabyList(HttpServletRequest httpServletRequest, + @RequestParam(value = "queryNo", required = false) String queryNo, + @RequestParam(value = "mcardNo", required = false) String mcardNo, + @RequestParam(value = "bcardNo", required = false) String bcardNo, + @RequestParam(value = "mphone", required = false) String mphone, + @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge, + @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge, + @RequestParam(value = "birth", required = false) String birth, + @RequestParam(value = "nextDate", required = false) String nextDate, + @RequestParam(value = "endCaseTime", required = false) String endCaseTime, + @RequestParam(value = "expVip", required = false) Integer expVip, + @RequestParam(value = "serviceType", required = false) Integer serviceType, + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "highRiskType", required = false) Integer highRiskType, + @RequestParam(value = "diagnose", required = false) String diagnose, + @RequestParam(value = "dateRange", required = false) String dateRange, + @RequestParam(value = "highRiskInfos", required = false) List highRiskInfos, + @RequestParam(value = "weakSonInfos", required = false) List weakSonInfos, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, + @RequestParam(value = "showDetail", defaultValue = "0") Integer showDetail, + @RequestParam(value = "isShowPhone",required = false) Integer isShowPhone, + @RequestParam(value = "buildDoctor", required = false) String buildDoctor, + @RequestParam(value = "provinceId", required = false) String provinceId, + @RequestParam(value = "cityId", required = false) String cityId, + @RequestParam(value = "areaId", required = false) String areaId, + @RequestParam(value = "weakSonInfo", required = false) String weakSonInfo, + @RequestParam(value = "highRiskInfo", required = false) String highRiskInfo, + @RequestParam(value = "streetId", required = false) String streetId, + @RequestParam(value = "hospitalProvinceId", required = false) String hospitalProvinceId, + @RequestParam(value = "hospitalCityId", required = false) String hospitalCityId, + @RequestParam(value = "hospitalAreaId", required = false) String hospitalAreaId, + @RequestParam(value = "hospitalId", required = false) String hospitalId, + @RequestParam(value = "vcCardNo", required = false) String vcCardNo, + @RequestParam(value = "liveType", required = false) String liveType, + @RequestParam(value = "isArea", required = false) String isArea, + @RequestParam(value = "fmHospitalId", required = false) String fmHospitalId, + @RequestParam(value = "openDisease", required = false) String openDisease, + @RequestParam(value = "endCase", required = false) Integer endCase, + @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart, + @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd, + @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor, + @RequestParam(value = "riskCode", required = false) String riskCode, + @RequestParam(value = "healthHigh", required = false) Integer healthHigh, + @RequestParam(value = "mildAnaemia", required = false) String mildAnaemia, + @RequestParam(value = "moderateAnaemia", required = false) String moderateAnaemia, + @RequestParam(value = "heartMurmur", required = false) String heartMurmur, + @RequestParam(value = "cyNumType", required = false) Integer cyNumType, + @RequestParam(value = "qcNumType", required = false) Integer qcNumType, + @RequestParam(value = "settleType", required = false) Integer settleType, + @RequestParam(value = "settleTime", required = false) String settleTime, + @RequestParam(value = "positiveType", required = false) String positiveType, + @RequestParam(value = "lhEyePositiveType", required = false) String lhEyePositiveType, + @RequestParam(value = "babyProvinceId", required = false) String babyProvinceId, + @RequestParam(value = "babyCityId", required = false) String babyCityId, + @RequestParam(value = "babyAreaId", required = false) String babyAreaId, + @RequestParam(value = "babyStreetId", required = false) String babyStreetId, + @RequestParam(value = "areaType", required = false) Integer areaType + ) { + + if (CollectionUtils.isNotEmpty(highRiskInfos)) { + + System.out.println(highRiskInfos.size() + ":highRiskInfos"); + } + if (CollectionUtils.isNotEmpty(weakSonInfos)) { + System.out.println("weakSonInfos:" + weakSonInfos.size()); + } + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + BabyManageRequest request = new BabyManageRequest(); + request.setFmHospitalId(fmHospitalId); + request.setVcCardNo(vcCardNo); + request.setWeakSonInfos(weakSonInfos); + request.setHighRiskInfos(highRiskInfos); + request.setShowDetail(showDetail); + request.setIsShowPhone(isShowPhone); + request.setBuildDoctor(buildDoctor); + request.setQueryNo(queryNo); + request.setBcardNo(bcardNo); + request.setMcardNo(mcardNo); + startMonthAge = 39; + endMonthAge = 40; + request.setMphone(mphone); + if(startMonthAge!=null) {//不改变之前逻辑 + //儿童管理页面月龄条件查询36：3岁 37:4岁 38：5岁 39：6岁 40：>6岁 + switch (startMonthAge) { + case 36: + request.setMonthAgeStart(startMonthAge); + break; + case 37: + request.setMonthAgeStart(48); + break; + case 38: + request.setMonthAgeStart(60); + break; + case 39: + request.setMonthAgeStart(72); + break; + case 40: + request.setMonthAgeStart(84); + break; + default: + request.setMonthAgeStart(startMonthAge); + } + }else { + request.setMonthAgeStart(startMonthAge); + } + + if(endMonthAge!=null) {//不改变之前逻辑 + switch (endMonthAge) { + case 36: + request.setMonthAgeEnd(47); + break; + case 37: + request.setMonthAgeEnd(59); + break; + case 38: + request.setMonthAgeEnd(71); + break; + case 39: + request.setMonthAgeEnd(83); + break; + case 40: + request.setMonthAgeEnd(null); + break; + default: + request.setMonthAgeEnd(endMonthAge); + } + }else { + request.setMonthAgeEnd(endMonthAge); + } + request.setBirth(birth); + request.setNextDate(nextDate); + request.setEndCaseTime(endCaseTime); + request.setExpVip(expVip); + request.setHighRiskType(highRiskType); + request.setServiceType(serviceType); + request.setDiagnose(diagnose); + request.setName(name); + request.setLimit(limit); + request.setPage(page); + request.setServiceStatus(serviceStatus); + request.setDateRange(dateRange); + // 省 + request.setProvinceId(provinceId); + // 市 + request.setCityId(cityId); + // 区/县 + request.setAreaId(areaId); + request.setStreetId(streetId); + // 建档医院 + request.setHospitalProvinceId(hospitalProvinceId); + request.setHospitalCityId(hospitalCityId); + request.setHospitalAreaId(hospitalAreaId); + request.setHospitalId(hospitalId); + // 是否区域 + request.setIsArea(isArea); + //高危因素id + request.setHighRiskInfo(highRiskInfo); + //体弱儿因素id + request.setWeakSonInfo(weakSonInfo); + request.setLiveType(liveType); + request.setEndCase(endCase); + request.setOpenDisease(openDisease); + request.setDueWeekStart(dueWeekStart); + request.setDueWeekEnd(dueWeekEnd); + request.setLastCheckDoctor(lastCheckDoctor); + request.setRiskCode(riskCode); + request.setHealthHigh(healthHigh); + //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选 + request.setMildAnaemia(mildAnaemia); + request.setModerateAnaemia(moderateAnaemia); + request.setHeartMurmur(heartMurmur); + request.setPositiveType(positiveType); + request.setLhEyePositiveType(lhEyePositiveType); + //出牙数状态 + request.setCyNumType(cyNumType); + //龋齿状态 + request.setQcNumType(qcNumType); + //高危结案状态 + request.setSettleType(settleType); + //高危结案时间 + request.setSettleTime(settleTime); + //户籍地 + request.setBabyProvinceId(babyProvinceId); + request.setBabyCityId(babyCityId); + request.setBabyAreaId(babyAreaId); + request.setBabyStreetId(babyStreetId); + request.setAreaType(areaType); + return babyBookbuildingFacade.queryBabyList(request, loginState.getId()); + } + /** * 查询符合条件的儿童 * 判断是否已有儿童中 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java index 9d5dcd9..09d8eb8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java @@ -100,6 +100,19 @@ public class BabyOralCheckController extends BaseController { return babyOralCheckFacade.queryDateListPage(babyOralCheckQuery,loginState.getId()); } /** + * 口腔检查列表 + * @param babyOralCheckQuery + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/queryDateListPageExport",method = RequestMethod.GET) + public void queryDateListPageExport(BabyOralCheckQuery babyOralCheckQuery, HttpServletRequest request,HttpServletResponse response) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + babyOralCheckFacade.queryDateListPageExport(babyOralCheckQuery, loginState.getId(), response); + } + /** * 儿童口腔管理 * @param babyModelQuery * @param request @@ -112,6 +125,19 @@ public class BabyOralCheckController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return babyOralCheckFacade.queryBabyOralListPage(babyModelQuery,loginState.getId()); } + /** + * 儿童口腔管理 + * @param babyModelQuery + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/queryBabyOralListPageExport",method = RequestMethod.GET) + public void queryBabyOralListPageExport(BabyModelQuery babyModelQuery, HttpServletRequest request,HttpServletResponse response) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + babyOralCheckFacade.queryBabyOralListPageExport(babyModelQuery,loginState.getId(),response); + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java index efcc5de..6610d7f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java @@ -1,18 +1,23 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.LhBabyEyeCheckService; 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.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.LhBabyEyeCheckFacade; import com.lyms.platform.pojo.LhBabyEyeCheck; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.LhBabyEyelCheckQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** @@ -27,6 +32,8 @@ public class LhBabyEyeCheckController extends BaseController { @Autowired private LhBabyEyeCheckFacade lhBabyEyeCheckFacade; + @Autowired + private LhBabyEyeCheckService lhBabyEyeCheckService; @@ -45,6 +52,34 @@ public class LhBabyEyeCheckController extends BaseController { return lhBabyEyeCheckFacade.addOrUpDate(babyCheck, loginState.getId()); } /** + * 搜索儿童体检套餐是否使用 + * @param babyCheck + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/findisTJTC",method = RequestMethod.POST) + public BaseResponse findisTJTC(@RequestBody LhBabyEyeCheck babyCheck, HttpServletRequest request) { + + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + LhBabyEyelCheckQuery babyQuery = new LhBabyEyelCheckQuery(); + babyQuery.setCheckMonthId(babyCheck.getCheckMonthId()); + List lhBaby = lhBabyEyeCheckService.queryList(babyQuery, Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); + BaseObjectResponse br = new BaseObjectResponse(); + if (lhBaby.size()>1){ + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); + br.setErrormsg("失败"); + br.setData(babyCheck.getId()); + return br; + } + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + br.setData(babyCheck.getId()); + return br; + } + + /** * 删除检查 * @param id * @return 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 570b2c7..48a8b30 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 @@ -255,6 +255,84 @@ public class MatDeliverController extends BaseController { return baseListResponse; } + /** + * @auther FengNing + * @createTime 2016年12月07日 14时22分 + * @discription 已结案产妇管理 + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "childbirthYJAManager", method = RequestMethod.POST) + //@RequestBody + public BaseListResponse childbirthYJAManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) { + + BaseListResponse baseListResponse; + childbirthManagerRequest.setStatus(5); + childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); + String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); + try { + Map query; + if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { + // 自定义查询 + query = new HashMap<>(); + String initQuery = childbirthManagerRequest.getInitQuery(); + for (String key : childbirthManagerRequest.getInitQueryMap().keySet()) { + if (initQuery.contains(key)) { + query.put(key, query.get(key)); + } + } + } else { + // 没有自定义查询，开始构造普通查询 + if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) { + // 非区域 + query = childbirthManagerRequest.getNormalQueryMap(); + } else { + // 区域 + query = childbirthManagerRequest.getAreaQueryMap(); + } + String queryStr = ""; + for (String key : query.keySet()) { + queryStr += key + ","; + } + childbirthManagerRequest.setInitQuery(queryStr.substring(0, queryStr.length() - 1)); + } + + ChildbirthManagerResult childbirthManagerResult = matDeliverFacade.childbirthManager(childbirthManagerRequest); + if (childbirthManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { + baseListResponse = new BaseListResponse().setErrorcode(childbirthManagerResult.getErrorcode()).setErrormsg(childbirthManagerResult.getErrormsg()); + return baseListResponse; + } + + // 根据查询规则构造返回bean + List objectList = new LinkedList<>(); + if (childbirthManagerResult.getData() != null) { + for (Object temp : childbirthManagerResult.getData()) { + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + + if (og != null && "2".equals(og.getCityId()) && childbirthManagerRequest.getShowDetail() == 1) {//需要隐藏姓名、地址 + if (temp instanceof ChildbirthManagerQueryModel) { + ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp; + //出生医学证明卫纪委修改分娩记录可以查看到孕妇名称2018-04-28 +// result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName())); + result.setAddress(com.lyms.platform.common.utils.StringUtils.encryAddr(result.getAddress())); + } + } + + for (String key : query.keySet()) { + query.put(key, BeanUtils.objectToStringMap(temp).get(key)); + } + objectList.add(BeanUtils.createStringBean(query)); + } + } + + baseListResponse = new BaseListResponse().setErrorcode(childbirthManagerResult.getErrorcode()).setErrormsg(childbirthManagerResult.getErrormsg()).setData(objectList).setPageInfo(childbirthManagerResult.getPageInfo()); + } catch (Exception e) { + baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + ExceptionUtils.catchException(e, "childbirthManager异常"); + } + return baseListResponse; + } + @TokenRequired @RequestMapping(value = "childbirthManagerExcel", method = RequestMethod.POST) public void childbirthManagerExcel(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index b6afbab..5bd3fc8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -759,4 +759,18 @@ public class PregnantBuildController extends BaseController { BaseObjectResponse objectResponse = bookbuildingFacade.queryAreaOrgs(loginState.getId()); return objectResponse; } + + /** + * 乡下村级单位统计-丰宁需求根据账号地址获取其下属单位 + * + * @return + */ + @RequestMapping(value = "/queryVillageOrgs", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryVillageOrgs(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseObjectResponse objectResponse = bookbuildingFacade.queryVillageOrgs(loginState.getId()); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 8609af6..a67cd57 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -160,6 +160,8 @@ public class PuerperaManageController extends BaseController { } + + /** * 初诊检查医生统计 * @param patientsQueryRequest diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 6b9e935..9e47800 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -6290,6 +6290,37 @@ public class TestController extends BaseController { return "success"; } + /** + * 秦皇岛妇幼孕妇补填血压 + * @return + */ + @RequestMapping(value = "/addYfTXL", method = RequestMethod.GET) + @ResponseBody + public String addYfTXL(String start,String end) { + + Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()).and("hospitalId").is("216") + .and("bp").exists(false).and("checkDate").gte(DateUtil.parseYMD(start)).lte(DateUtil.parseYMD(end)); + List checkModels = mongoTemplate.find(new Query(criteria),AntenatalExaminationModel.class); + if (CollectionUtils.isNotEmpty(checkModels)) + { + for (AntenatalExaminationModel checkModel : checkModels) + { + Map result = new HashMap<>(); + result.put("ssy", NumberUtils.getRandomInt(133,120)+""); + result.put("szy", NumberUtils.getRandomInt(80,65)+""); + + checkModel.setBp(JsonUtil.obj2JsonString(result)); + + System.out.println("血压 update "+checkModel.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkModel)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkModel.getId())), update, + AntenatalExaminationModel.class); + } + } + return "success"; + } + @RequestMapping(value = "/addYfxyhandle", method = RequestMethod.GET) @ResponseBody public String addYfxyhandle(String start,String end) { @@ -6329,7 +6360,8 @@ public class TestController extends BaseController { @RequestMapping(value = "/addYftxl", method = RequestMethod.GET) @ResponseBody public String addYftxl(String start,String end) { - + start = "2023-04-12 08:23:34.560Z"; + end = "2018-04-12 08:23:34.560Z"; Criteria criteria = Criteria.where("yn").is(YnEnums.YES.getId()).and("hospitalId").is("216") .and("tireData.heartRate").exists(false).and("checkDate").gte(DateUtil.parseYMD(start)).lte(DateUtil.parseYMD(end)); List checkModels = mongoTemplate.find(new Query(criteria),AntenatalExaminationModel.class); 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 fc2a92b..0b1da9d 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 @@ -389,7 +389,7 @@ public class AntenatalExaminationFacade { if (resp.getErrorcode() != 0) { return resp; } else { - couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId()); + couponService.use1(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), antExAddRequest.getCheckDoctor(), model.getId()); //秦皇岛妇幼使用完优惠劵后需要把对应优惠劵插入到秦皇岛妇幼his if ("216".equals(hospitalId)) { @@ -472,7 +472,7 @@ public class AntenatalExaminationFacade { if (resp.getErrorcode() != 0) { return resp; } else { - couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId()); + couponService.use1(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), antExAddRequest.getCheckDoctor(), model.getId()); //秦皇岛妇幼使用完优惠劵后需要把对应优惠劵插入到秦皇岛妇幼his if ("216".equals(hospitalId)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java index daa48a1..90f11f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java @@ -124,6 +124,9 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { model.setYashu(request.getYashu()); model.setQuchi(request.getQuchi()); + model.setSjjc(request.getSjjc()); + model.setSysj(request.getSysj()); + model.setYw(request.getYw()); model.setLeftRefraction(request.getLeftRefraction()); model.setLeftRefractionDS(request.getLeftRefractionDS()); model.setLeftRefractionDC(request.getLeftRefractionDC()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java index 27f6417..0628298 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java @@ -14,6 +14,7 @@ import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MongoUtil; +import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; @@ -31,6 +32,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; +import javax.servlet.http.HttpServletResponse; import java.util.*; @Component @@ -315,4 +317,168 @@ public class BabyOralCheckFacade { br.setErrormsg("成功"); return br; } + + public void queryDateListPageExport(BabyOralCheckQuery request, Integer id, HttpServletResponse response) { + String hospitalId = autoMatchFacade.getHospitalId(id); + request.setHospitalId(hospitalId); + request.setYn(YnEnums.YES.getId()); + request.setNeed("true"); + //结束日期加上时分秒 + if (request.getBirthEnd() != null) { + request.setBirthEnd(DateUtil.getDayLastSecond(request.getBirthEnd())); + } + if (request.getCreatedEnd() != null) { + request.setCreatedEnd(DateUtil.getDayLastSecond(request.getCreatedEnd())); + } + if (request.getOralCheckTimeEnd() != null) { + request.setOralCheckTimeEnd(DateUtil.getDayLastSecond(request.getOralCheckTimeEnd())); + } + if (request.getNextOralCheckTimeEnd() != null) { + request.setNextOralCheckTimeEnd(DateUtil.getDayLastSecond(request.getNextOralCheckTimeEnd())); + } + //当前月龄筛选 + if(request.getQueryMonthAgeStart()!=null && request.getQueryMonthAgeEnd()!=null){ + request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd())); + request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart())); + } + List babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,new String[]{"oralCheckTime", "created"}); + List datas=new ArrayList<>(); + for (BabyOralCheck babyOralCheck : babyOralChecks) { + Map map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map + map.put("sex",SexEnum.getTextById(babyOralCheck.getBabySex())); + map.put("oralCheckDoctor",couponMapper.getUserName(babyOralCheck.getOralCheckDoctor())); + map.put("name",babyOralCheck.getBabyName()); + map.put("id",babyOralCheck.getId()); + map.put("sex",babyOralCheck.getBabySex()); + map.put("birth",babyOralCheck.getBirth()); + map.put("mname",babyOralCheck.getBabyMName()); + map.put("checkMonth",babyOralCheck.getCheckMonthAge()); + map.put("qc",babyOralCheck.getQc()); + map.put("hc",babyOralCheck.getHc()); + map.put("wgfd",babyOralCheck.getWgfb()); + map.put("oralCheckDoctor",babyOralCheck.getOralCheckDoctor()); + map.put("babyBuildDate",babyOralCheck.getBabyBuildDate()); + map.put("oralCheckTime",babyOralCheck.getOralCheckTime()); + map.put("nextOralCheckTime",babyOralCheck.getNextOralCheckTime()); + datas.add(map); + } + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("name", "儿童姓名"); + cnames.put("sex", "性别"); + cnames.put("birth", "出生日期"); + cnames.put("mname", "母亲姓名"); + cnames.put("checkMonth", "检查月龄"); + + cnames.put("qc", "龋齿"); + cnames.put("hc", "护齿"); + cnames.put("wgfb", "窝沟封闭"); + cnames.put("oralCheckDoctor", "检查医生"); + cnames.put("babyBuildDate", "建档日期"); + cnames.put("oralCheckTime", "检查日期"); + //秦皇岛儿保-眼科检查-分类 + cnames.put("nextOralCheckTime", "预约时间"); + + List> results = new ArrayList<>(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { + int i = 0; + for (Map data : datas) { + Map result = new LinkedHashMap<>(); + result.put("id", ++i); + result.put("name", data.get("name")); + result.put("sex", data.get("sex")); + result.put("mname", data.get("mname")); + result.put("checkMonth", data.get("checkMonth")); + result.put("birth", data.get("birth")); + result.put("qc", data.get("qc")); + result.put("hc", data.get("hc")); + result.put("wgfb", data.get("wgfb")); + result.put("oralCheckDoctor", data.get("oralCheckDoctor")); + result.put("babyBuildDate", data.get("babyBuildDate")); + //秦皇岛儿保-眼科检查-分类 + result.put("oralCheckTime", data.get("oralCheckTime")); + result.put("nextOralCheckTime", data.get("nextOralCheckTime")); + results.add(result); + } + } + + ResponseUtil.responseExcel(cnames, results, response); + } + + public void queryBabyOralListPageExport(BabyModelQuery babyModelQuery, Integer id, HttpServletResponse response) { + String hospitalId = autoMatchFacade.getHospitalId(id); + babyModelQuery.setNeed("true"); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setOralCheckYn(YnEnums.YES.getId()); + babyModelQuery.setHospitalId(hospitalId); + //结束日期加上时分秒 + if (babyModelQuery.getOralCheckTimeEnd() != null) { + babyModelQuery.setOralCheckTimeEnd(DateUtil.getDayLastSecond(babyModelQuery.getOralCheckTimeEnd())); + } + if (babyModelQuery.getNextOralCheckTimeEnd() != null) { + babyModelQuery.setNextOralCheckTimeEnd(DateUtil.getDayLastSecond(babyModelQuery.getNextOralCheckTimeEnd())); + } + //当前月龄筛选 + if(babyModelQuery.getQueryMonthAgeStart()!=null && babyModelQuery.getQueryMonthAgeEnd()!=null){ + babyModelQuery.setBirthStart(DateUtil.getBirthStart(babyModelQuery.getQueryMonthAgeEnd())); + babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(babyModelQuery.getQueryMonthAgeStart())); + } + List babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "oralCheckTime", Sort.Direction.DESC); + List datas=new ArrayList<>(); + for (BabyModel babyModel : babyModelList) { + Map map=new HashMap<>(); + map.put("babyId",babyModel.getId()); + map.put("oralCheckId",babyModel.getOralCheckId());//最后一次检查记录id + map.put("babyName",babyModel.getName()); + map.put("sex",SexEnum.getTextById(babyModel.getSex())); + map.put("mName",babyModel.getMname()); + map.put("birth", DateUtil.getyyyy_MM_dd(babyModel.getBirth()));//出生日期 + map.put("buildDate", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate()));//建档日期 + map.put("oralCheckDoctor",couponMapper.getUserName(babyModel.getOralCheckDoctor())); + map.put("positive", StringUtils.isNotEmpty(babyModel.getPositiveType())?("2".equals(babyModel.getPositiveType())?"阳性":"正常"):"");//阳性项目 + map.put("checkTime", DateUtil.getYyyyMmDd(babyModel.getOralCheckTime()));//检查日期 + map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyModel.getNextOralCheckTime()));//预约日期 + map.put("oralCheckMonthAge", babyModel.getOralCheckMonthAge());//检查月龄 + map.put("hc", babyModel.getHc()); + map.put("qc", babyModel.getQc()); + map.put("wgfb", babyModel.getWgfb()); + datas.add(map); + } + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("name", "儿童姓名"); + cnames.put("sex", "性别"); + cnames.put("birth", "出生日期"); + cnames.put("mname", "母亲姓名"); + cnames.put("checkMonth", "检查月龄"); + cnames.put("positive", "检查结果"); + cnames.put("oralCheckDoctor", "检查医生"); + cnames.put("buildDate", "建档日期"); + cnames.put("checkTime", "检查日期"); + //秦皇岛儿保-眼科检查-分类 + cnames.put("oralCheckMonthAge", "预约时间"); + + List> results = new ArrayList<>(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { + int i = 0; + for (Map data : datas) { + Map result = new LinkedHashMap<>(); + result.put("id", ++i); + result.put("name", data.get("name")); + result.put("sex", data.get("sex")); + result.put("mname", data.get("mname")); + result.put("checkMonth", data.get("checkMonth")); + result.put("birth", data.get("birth")); + result.put("positive", data.get("positive")); + result.put("oralCheckDoctor", data.get("oralCheckDoctor")); + result.put("buildDate", data.get("buildDate")); + //秦皇岛儿保-眼科检查-分类 + result.put("checkTime", data.get("checkTime")); + result.put("oralCheckMonthAge", data.get("oralCheckMonthAge")); + results.add(result); + } + } + + ResponseUtil.responseExcel(cnames, results, response); + } } 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 3e0be40..878d5ac 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 @@ -348,7 +348,7 @@ public class BookbuildingFacade { patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime())); patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周 - + patient.setBooksuifangDoctor(yunRequest.getBooksuifangDoctor()); //承德市妇幼通过就诊卡号查询到病人id保存下来 if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) { patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo())); @@ -1208,6 +1208,7 @@ public class BookbuildingFacade { patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime())); patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周 + patient.setBooksuifangDoctor(yunRequest.getBooksuifangDoctor()); patient.setModified(new Date()); patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate()))); // patient.setHospitalId(autoMatchFacade.getHospitalId(userId)); @@ -2313,6 +2314,20 @@ public class BookbuildingFacade { result.setBookbuildingDoctor(doctorObj); } } + if (StringUtils.isNotEmpty(p.getTownOrgId())) { + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setOrgId(Integer.parseInt(p.getTownOrgId())); + List users = usersService.queryUsers(usersQuery); + for (Users u : users) { + Map map = new HashMap(); + if (u != null) { + Map doctorObj = new HashMap<>(); + map.put("id", p.getTownOrgId()); + map.put("name", u.getName()); + result.setBooksuifangDoctor(map); + } + } + } result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate())); result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType())); @@ -3611,4 +3626,50 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseObjectResponse queryVillageOrgs(Integer id) { + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setId(id); + + usersQuery.setYn(1); + List list = usersService.queryUsers(usersQuery); + BaseObjectResponse objectResponse = new BaseObjectResponse(); + if (list.size()==1){ + Users userr = list.get(0); + Organization organization =masterOrganizationMapper.getOrganization(userr.getDeptId()); + List basicConfigList = basicConfigDao.queryBasicConfig(MongoCondition.newInstance("parentId", organization.getAreaId(), MongoOper.IS). + and("yn", YnEnums.YES.getId(), MongoOper.IS).toMongoQuery()); + +// Map map=new HashMap(); + + List datas=new ArrayList<>(); + for (BasicConfig basicConfig : basicConfigList){ + Map map=new HashMap<>(); + List basicConfigList1 = basicConfigDao.queryBasicConfig(MongoCondition.newInstance("parentId", basicConfig.getId(), MongoOper.IS). + and("yn", YnEnums.YES.getId(), MongoOper.IS).toMongoQuery()); + +// List> Maplist = new ArrayList<>(); +// for (BasicConfig basicConfig1 : basicConfigList1) { +// +// map.put("name",basicConfig1.getName()); +// map.put("parentId",basicConfig1.getParentId()); +// Maplist.add(map); +// } + map.put("basicConfigListname",basicConfig); + map.put("map",basicConfigList1); + datas.add(map); + + } + objectResponse.setData(datas); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + }else{ + objectResponse.setData(null); + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrormsg("失败"); + return objectResponse; + } + + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index f807842..8a9be55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -106,19 +106,27 @@ public class LhBabyEyeCheckFacade { }else { return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD); } +// checkMonthId + LhBabyEyelCheckQuery babyQuery = new LhBabyEyelCheckQuery(); + babyQuery.setCheckMonthId(babyModel.getCheckMonthId()); + List lhBaby = lhBabyEyeCheckService.queryList(babyQuery,Sort.Direction.DESC,new String[]{"eyeCheckTime","created"}); //添加 - if (StringUtils.isEmpty(babyCheck.getId())) { - lhBabyEyeCheckService.add(babyCheck); - //operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), babyCheck, OptActionEnums.ADD.getId(), "添加眼健康检查"); - }else {//修改 - babyCheck.setOperaterId(userid+""); - babyCheck.setModified(new Date()); - lhBabyEyeCheckService.update(babyCheck); - LhBabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), LhBabyEyeCheck.class); + + if (StringUtils.isEmpty(babyCheck.getId())) { + + lhBabyEyeCheckService.add(babyCheck); + //operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), babyCheck, OptActionEnums.ADD.getId(), "添加眼健康检查"); + }else {//修改 + babyCheck.setOperaterId(userid+""); + babyCheck.setModified(new Date()); + lhBabyEyeCheckService.update(babyCheck); + LhBabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), LhBabyEyeCheck.class); // if (null!=Check) { // operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), Check, OptActionEnums.UPDATE.getId(), "修改眼健康检查"); // } - } + } + + //同步数据到儿童档案 LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java index bbd8975..deba63c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java @@ -105,7 +105,12 @@ public class BabyKindergartenCheckRequest { private String wszq; //脊柱及四肢 private String jzjsz; - + //色觉检查 + private String sjjc; + //双眼视觉 + private String sysj; + //眼位 + private String yw; //眼左: private String leftEye; //眼右: @@ -181,6 +186,30 @@ public class BabyKindergartenCheckRequest { //脊柱及四肢-其他 private String jzjszQt; + public String getSjjc() { + return sjjc; + } + + public void setSjjc(String sjjc) { + this.sjjc = sjjc; + } + + public String getSysj() { + return sysj; + } + + public void setSysj(String sysj) { + this.sysj = sysj; + } + + public String getYw() { + return yw; + } + + public void setYw(String yw) { + this.yw = yw; + } + public String getJzjszQt() { return jzjszQt; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 2607da4..04b1236 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -15,6 +15,17 @@ public class BabyManageRequest extends BaseQuery { private String mname; //服务状态 private Integer serviceStatus; + //月龄套餐 + private Integer tctype; + + public Integer getTctype() { + return tctype; + } + + public void setTctype(Integer tctype) { + this.tctype = tctype; + } + //服务类型 private Integer serviceType; //妈咪身份证号 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index d4f7676..3980801 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -51,6 +51,8 @@ public class YunBookbuildingAddRequest { private FilePathModel filePath; + //随访医生 + private String booksuifangDoctor; //孕妇证件核验方式 1 自动核验 2人工核验 private String patientVerifType; @@ -81,6 +83,14 @@ public class YunBookbuildingAddRequest { //归属地id private String addressId; + public String getBooksuifangDoctor() { + return booksuifangDoctor; + } + + public void setBooksuifangDoctor(String booksuifangDoctor) { + this.booksuifangDoctor = booksuifangDoctor; + } + public String getAddressId() { return addressId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index 26a5cef..71da758 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -94,6 +94,8 @@ public class BabyManageListResult { private String lastCheckDoctor; private String riskCode; + private String liveType; + /************************************************* * 秦皇岛-高危儿因素详情-替换原诊断位置 */ @@ -138,6 +140,14 @@ public class BabyManageListResult { return dataStatus; } + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public void setDataStatus(Integer dataStatus) { this.dataStatus = dataStatus; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 573292d..d0629b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -363,6 +363,17 @@ public class PregnantInfoResult { //建档医生 private Map bookbuildingDoctor; + //随访医生 + private Map booksuifangDoctor; + + public Map getBooksuifangDoctor() { + return booksuifangDoctor; + } + + public void setBooksuifangDoctor(Map booksuifangDoctor) { + this.booksuifangDoctor = booksuifangDoctor; + } + //建档日期 private String bookbuildingDate; //服务类型 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 869ea8b..47f0f5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -41,6 +41,10 @@ public class QuanChanResult implements IBasicResultConvert patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(couponInfo.get("user_id")) .and("yn").is(1)), Patients.class); + List antenatalExaminationModel = antenatalExaminationService.findAllByParentId(patients.get(0).getId()); + if (antenatalExaminationModel.size()>0){ + couponInfo.put("operator_use_id",antenatalExaminationModel.get(0).getCheckDoctor()); + } + String age = ""; if (CollectionUtils.isNotEmpty(patients) && useDate != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index f7309de..7cec45a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -18,6 +18,7 @@ import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.query.BabyCheckModelQuery; +import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; @@ -177,6 +178,14 @@ public class BabyListTask implements Callable { result.setPatientId(model.getParentId()); result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate())); result.setHospitalName(hospitalName); + if (model.getLiveType()!=null){ + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(model.getLiveType()); + + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + result.setLiveType(basicConfigList.get(0).getName()); + } result.setMcertNo(model.getMcertNo()); result.setMcertTypeId(model.getMcertTypeId()); @@ -255,8 +264,8 @@ public class BabyListTask implements Callable { { fmHospitalName = model.getDeliverOrg() == null ? "" : model.getDeliverOrg(); } - result.setFmHospitalName(fmHospitalName); + result.setFmHospitalName(fmHospitalName); result.setOpenDisease(model.getOpenDisease() == null || "1".equals(model.getOpenDisease()) ? "未开通" : "开通"); result.setCardNo(model.getCardNo()); result.setVcCardNo(model.getVcCardNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java index a5dfe4b..583f442 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java @@ -225,6 +225,14 @@ public class QuanChanPatientWorker implements Callable > { chanResult.setlName(patients.getBookbuildingDoctor()); } } + if (patients.getPliveTypeId()!=null){ + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(patients.getPliveTypeId()); + + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + chanResult.setLiveType(basicConfigList.get(0).getName()); + } chanResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); //注册地址 chanResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index d1206e2..14b7139 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -23,6 +23,7 @@ import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; +import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -87,7 +88,14 @@ public class WorkHR implements Callable> { riskPatientsResult.setlName(patients.getBookbuildingDoctor()); } } + if (patients.getPliveTypeId()!=null){ + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(patients.getPliveTypeId()); + //所有数据 + List basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery); + riskPatientsResult.setLiveType(basicConfigList.get(0).getName()); + } if (StringUtils.isNotEmpty(patients.getFirstCheckId())) { if (NumberUtils.isNumber(patients.getFirstCheckId())) { @@ -190,6 +198,7 @@ public class WorkHR implements Callable> { } + riskPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); riskPatientsResult.setcTime(nextCheckTime); diff --git a/pom.xml b/pom.xml index feb1147..67d6827 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,10 @@ - + platform-reportData - + platform-msg-generate