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 3b07f28..94fe08e 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 @@ -429,6 +429,71 @@ public class BabyEyeCheck extends BaseModel { /****************************************/ + /** + * 秦皇岛 + * 儿童眼保健检查-新增页面 检查套餐上面加“来源”这四类可以多选。 + * 第1类:健康查体 又分为 ，散居 手动输入 ，整体 选择幼儿园机构（院方提供商的幼儿园数据） + * 第2类:幼儿园转诊 选择幼儿园机构（院方提供幼儿园数据） + * 第3类:基层转诊 选择基层机构（院方提供基层数据） + * 第4类:本院 + */ + private String source; //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院 + private Integer healthCheckType;//1：健康查体: 1：散居、2:整体 + private String healthCheckTypeScattered; //1:散居（手输） + private String healthCheckTypeWhole; //2:整体（直接存选中的名字） + private String kindergarten;//2：幼儿园转诊--幼儿园机构（直接存选中的名字） + private String basicOrganization;//3:基层转诊--基层机构（直接存选中的名字） + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Integer getHealthCheckType() { + return healthCheckType; + } + + public void setHealthCheckType(Integer healthCheckType) { + this.healthCheckType = healthCheckType; + } + + public String getHealthCheckTypeScattered() { + return healthCheckTypeScattered; + } + + public void setHealthCheckTypeScattered(String healthCheckTypeScattered) { + this.healthCheckTypeScattered = healthCheckTypeScattered; + } + + public String getHealthCheckTypeWhole() { + return healthCheckTypeWhole; + } + + public void setHealthCheckTypeWhole(String healthCheckTypeWhole) { + this.healthCheckTypeWhole = healthCheckTypeWhole; + } + + public String getKindergarten() { + return kindergarten; + } + + public void setKindergarten(String kindergarten) { + this.kindergarten = kindergarten; + } + + public String getBasicOrganization() { + return basicOrganization; + } + + public void setBasicOrganization(String basicOrganization) { + this.basicOrganization = basicOrganization; + } + + /****************************************/ + public List getHandleOpinionsIdList() { return handleOpinionsIdList; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 8f370eb..06ca75b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -357,7 +357,7 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } /**抛宫产次数类型 - * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 5：三次分娩首次抛宫产 */ private Integer cesareanTimeType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index ed53609..19b3ed2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -181,10 +181,10 @@ public class BabyEyeCheckController extends BaseController { @TokenRequired @RequestMapping(method = RequestMethod.GET) public BaseResponse list(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request, - Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) { + Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds,Integer classify) { return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, - bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds); + bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds,classify); } /** @@ -205,8 +205,8 @@ public class BabyEyeCheckController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/export", method = RequestMethod.GET) - public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) { - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, yeymcId,currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin); + public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify) { + babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, yeymcId,currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, classify); } @ResponseBody 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 0e3ffb3..bff3422 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 @@ -539,7 +539,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { } /**抛宫产次数类型 - * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 5：三次分娩首次抛宫产 */ private Integer cesareanTimeType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index 3e42c0f..76a0ebb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -437,7 +437,7 @@ public class ChildbirthManagerQueryModel { private String fmHospital; /**抛宫产次数类型 - * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 5：三次分娩首次抛宫产 */ private Integer cesareanTimeType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index ba3a454..ff52d5e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -30,7 +30,7 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, String apparatusPositive, - String doctorPositive, String yin,String noPassIds); + String doctorPositive, String yin, String noPassIds, Integer classify); BaseResponse childrenFilingList(Integer userId, Date startBuildDate, Date endBuildDate,Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, @@ -45,7 +45,7 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse listInit(Integer userId); - void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin); + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,Integer classify); BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId); public String getExcItems(BabyNerveMovementModel movementModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 2e66272..a68f79d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -26,13 +26,11 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; @@ -955,7 +953,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, - String apparatusPositive, String doctorPositive, String yin, String noPassIds) { + String apparatusPositive, String doctorPositive, String yin, String noPassIds, Integer classify) { boolean b = true; String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); @@ -998,6 +996,11 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(yin)) { criteria.and("apparatus").nin("2").and("doctorJudgement").nin("2"); } + //分类-1.近视高危、2.弱视高危、3.异常高危。 （筛选查询） + if (null!=classify) { + criteria.and("classify").is(classify); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(key) || org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) { Criteria c = new Criteria(); if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { @@ -1328,6 +1331,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor())); temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); temp.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); + //分类-1.近视高危、2.弱视高危、3.异常高危 + temp.put("classify", babyEyeCheck.getClassify()); CollectionUtils.removeNullValue(temp); restMap.add(temp); } @@ -2168,8 +2173,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } @Override - public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) { - BaseResponse rest = list(userId, startDate, endDate, doctor, key, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null); + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin, Integer classify) { + BaseResponse rest = list(userId, startDate, endDate, doctor, key, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null, classify); PageResult pageResult = (PageResult) rest.getObject(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>(); @@ -2182,6 +2187,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC cnames.put("positive", "阳性项目"); cnames.put("doctor", "检查医生"); cnames.put("checkTime", "检查日期"); + //秦皇岛儿保-眼科检查-分类 + cnames.put("classify", "分类"); List> results = new ArrayList<>(); if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { @@ -2197,6 +2204,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC result.put("positive", data.get("positive")); result.put("doctor", data.get("doctor")); result.put("checkTime", data.get("checkTime")); + //秦皇岛儿保-眼科检查-分类 + result.put("classify", data.get("classify")); results.add(result); } }