diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index fa72a01..3d2eada 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -358,7 +358,7 @@ public class BasicConfigServiceTest { query.setEnable(1); List list = mongoTemplate.find(query.convertToQuery().convertToMongoQuery(), BasicConfig.class); for (BasicConfig config : list) { - System.out.println(config.getName()); + // System.out.println(config.getName()); query.setParentId(config.getId()); List sublist = mongoTemplate.find(query.convertToQuery().convertToMongoQuery(), BasicConfig.class); // for (BasicConfig sub:sublist) { diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 6c39e82..464a4dd 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -122,7 +122,7 @@ public class PatientsService { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } - + //System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, field)); } @@ -142,6 +142,7 @@ public class PatientsService { } public int queryPatientCount(PatientsQuery patientsQuery) { + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); return iPatientDao.queryPatientCount(patientsQuery.convertToQuery()); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index 64bb332..53eb7f6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -211,17 +211,26 @@ public class BasicConfig extends BaseModel { public Map replenRisk(Map map){ map.put("id", id); - if (name.indexOf("黄色") > -1) { - name = "黄色"; - }else if (name.indexOf("橙色") > -1) { - name = "橙色"; - }else if (name.indexOf("红色") > -1) { - name = "红色"; - }else if (name.indexOf("紫色") > -1) { - name = "紫色"; + if ( name.split("-").length>1){ + String [] arrays= name.split("-"); + String color=""; + for (int i = 0,j=arrays.length; i < j ; i++) { + color+= "risk_"+RiskDefaultTypeEnum.getColor(arrays[i])+"."; + } + map.put("color", color); + }else { + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); return map; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index ea428ef..87f5088 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -453,6 +453,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private boolean dtFm=false; private String allPats; + private MongoCondition condition2; public String getAllPats() { return allPats; @@ -1319,7 +1320,37 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } }else { - condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); + String [] strs= allPats.split(","); + //针对单颜色级别处理 如果是单颜色level是1查询包含此颜色及紫色的所有数据 + if(strs.length>1){ + if ("1".equals(strs[1]) && !"224b2329-cb82-4da3-a071-8527f8283aab".equals(rLevel)){ + List riskLevelIds=new ArrayList<>(); + riskLevelIds.add(rLevel); + MongoCondition c = MongoCondition.newInstance(); + MongoCondition condition1 = MongoCondition.newInstance("riskLevelId", JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS); + + riskLevelIds.add("224b2329-cb82-4da3-a071-8527f8283aab"); + + MongoCondition condition2 = MongoCondition.newInstance("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS); + riskLevelIds.clear(); + + riskLevelIds.add("224b2329-cb82-4da3-a071-8527f8283aab"); + riskLevelIds.add(rLevel); + MongoCondition condition3 = MongoCondition.newInstance("riskLevelId",JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS); + if (c1 != null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{condition1, condition2,condition3}).getCriteria()); + } else { + c1 = c.orCondition(new MongoCondition[]{condition1, condition2,condition3}).getCriteria(); + } + }else { + List riskLevelIds=new ArrayList<>(); + riskLevelIds.add(rLevel); + condition = condition.and("riskLevelId", JsonUtil.array2JsonString(riskLevelIds), MongoOper.IS); + } + }else { + condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); + } + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java index 83552ee..3c57d85 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java @@ -3,4 +3,5 @@ package com.lyms.platform.operate.web.constant; public class OrganizationConstant { public static final String XT_WX = "2100002421"; + public static final String TY_DT = "2100002419"; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java index 07132a2..3861829 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java @@ -504,9 +504,9 @@ public class PatientDtController { @RequestMapping(method = RequestMethod.GET, value = "/dt/appointment") @ResponseBody public BaseResponse getAppointment(@RequestHeader("Authorization")String authorization, - @RequestParam(required = true) String doctor, - @RequestParam(required = true) String startTime, - @RequestParam(required = true) String endTime, + @RequestParam String doctor, + @RequestParam String startTime, + @RequestParam String endTime, @RequestParam(required = false) String name, @RequestParam(required = false) String doctorName @@ -581,8 +581,8 @@ public class PatientDtController { params.put("doctor",doctor); params.put("ksrq",date); params.put("jsrq",date); - String str= HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null); - System.out.println(str); + HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null); + //System.out.println(str); return new BaseResponse(); } } 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 291bea6..4129c4c 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 @@ -113,7 +113,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - patientsQueryRequest.setAllPats("allPats"); + // patientsQueryRequest.setAllPats("allPats"); return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), null, Boolean.FALSE); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java index 5879983..caac0b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java @@ -75,6 +75,21 @@ public class RiskReportController extends BaseController { return riskReportFacade.queryRiskReportCount(patientsQueryRequest,loginState.getId()); } + + /** + * 五色管理专案 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryRiskCount") + @ResponseBody + @TokenRequired + public BaseResponse queryRiskCount(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return riskReportFacade.queryRiskCount(patientsQueryRequest,loginState.getId()); + + } + + /** * 院内高危统计报表 左 导出 * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 6afab9a..4b52e5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -517,9 +517,9 @@ public class AntExRecordFacade { antExRecordQuery.setHospitalId(hospital); //antExRecordQuery.setType(1);//???? List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); - System.out.println("1 获取这段时间的产检条数------" + antExRecordModelList.size()); + // System.out.println("1 获取这段时间的产检条数------" + antExRecordModelList.size()); Map> map = handleAntexRecord2(antExRecordModelList); - System.out.println("2 将产检内容按照人存储，一个人可以多条-------" + map.size()); + // System.out.println("2 将产检内容按照人存储，一个人可以多条-------" + map.size()); if (map != null && map.size() > 0) { int conut = 0; String name = null; @@ -533,7 +533,7 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(valueList)) { ListSort(valueList);//升序 - System.out.println("3 单个孕妇产检数总数1---" + valueList.size()); + // System.out.println("3 单个孕妇产检数总数1---" + valueList.size()); AntExRecordModel antExRecordModel = valueList.get(0); name = antExRecordModel.getName(); carno = antExRecordModel.getCardNo(); @@ -558,7 +558,7 @@ public class AntExRecordFacade { czb = false;//复诊上面是初诊，下面比对新增高危时候就不直接添加上这个初诊了 } } - System.out.println("4 单个孕妇产检数总数2---" + valueList.size()); + // System.out.println("4 单个孕妇产检数总数2---" + valueList.size()); ListSort(valueList); //遍历个人产检记录list，获取产检高危因素、其它高危，剔除健康高危 @@ -596,7 +596,7 @@ public class AntExRecordFacade { } } - System.out.println("5 孕妇："+ name +"身份证："+ carno + "，高危添加总数---" + conut); //现在统计个数完全正确$$$$ + // System.out.println("5 孕妇："+ name +"身份证："+ carno + "，高危添加总数---" + conut); //现在统计个数完全正确$$$$ List riskStatisticsResults = new ArrayList<>(); for (String bcid: incrHrisk ) { if(bcid.contains("###")){ @@ -617,7 +617,7 @@ public class AntExRecordFacade { rsr.setColor(hosptialHighRisk.getColorName()); } riskStatisticsResults.add(rsr); - System.out.println(rsr.toString()); + // System.out.println(rsr.toString()); }else { RiskStatisticsResult rsr = new RiskStatisticsResult(); /*if(bcid.contains("fzgw@")){ @@ -635,13 +635,13 @@ public class AntExRecordFacade { rsr.setColor(HosptialHighRiskFacade.colorNameMap.get(colorCode)); } riskStatisticsResults.add(rsr); - System.out.println(rsr.toString()); + // System.out.println(rsr.toString()); } } - System.out.println("6 获取高危实体---- "+riskStatisticsResults.size()); + // System.out.println("6 获取高危实体---- "+riskStatisticsResults.size()); List> datas = new ArrayList<>(); if (CollectionUtils.isNotEmpty(riskStatisticsResults)) { for (RiskStatisticsResult rsr : riskStatisticsResults) { @@ -1277,7 +1277,7 @@ public class AntExRecordFacade { //antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); - System.out.println("antExRecordModelList====================" + antExRecordModelList.size()); + // System.out.println("antExRecordModelList====================" + antExRecordModelList.size()); Map> map = handleAntexRecord(antExRecordModelList); AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery(); @@ -1308,7 +1308,7 @@ public class AntExRecordFacade { antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(endDate)); antExRecordQuery.setHospitalId(hospitalId); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); - System.out.println("获取产检记录表 " + startDate + "到" + endDate + "共计条数：" + antExRecordModelList.size()); + // System.out.println("获取产检记录表 " + startDate + "到" + endDate + "共计条数：" + antExRecordModelList.size()); // 存储某个产检时间段，某个医院、高危数据 List list1 = new ArrayList(); @@ -1331,7 +1331,7 @@ public class AntExRecordFacade { map.put(recordModel.getParentId(), list); //初诊直接保存在 初诊list if (recordModel.getType() == 2 && CollectionUtils.isNotEmpty(recordModel.gethRisk())) { - System.out.println("初诊entry.size():" + recordModel.getId()); + // System.out.println("初诊entry.size():" + recordModel.getId()); getGwName(listgw, recordModel, false, null); //删除map内容 map.remove(recordModel.getParentId()); @@ -1349,7 +1349,7 @@ public class AntExRecordFacade { continue; } //复诊一次 - System.out.println("复诊一次entry.size():" + entry.size()); + // System.out.println("复诊一次entry.size():" + entry.size()); if (entry.size() == 1) { beforeRecordQuery.setParentId(entry.get(0).getParentId()); beforeRecordQuery.setCheckTimeLt(entry.get(0).getCheckTime()); @@ -1373,7 +1373,7 @@ public class AntExRecordFacade { } //复诊多次 else { - System.out.println("复诊多次entry.size():" + entry.size()); + // System.out.println("复诊多次entry.size():" + entry.size()); List entry1 = entry; for (int i = 0; i < entry1.size(); i++) { if (entry1.get(i).getCheckTime() != null) { @@ -1438,7 +1438,7 @@ public class AntExRecordFacade { } } - System.out.println("高危项目总计： " + listgw.size()); + // System.out.println("高危项目总计： " + listgw.size()); return new BaseListResponse().setData(listgw).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -1485,7 +1485,7 @@ public class AntExRecordFacade { if (end > parentIds.size()) { end = parentIds.size(); } - System.out.println("start:" + i + ",end:" + end); + // System.out.println("start:" + i + ",end:" + end); final List tempList = parentIds.subList(i, end); listFuture.add(commonThreadPool.submit(new Callable() { @Override @@ -1813,10 +1813,10 @@ public class AntExRecordFacade { if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { if (isOpenAutoSaveAntenatal(hospitalId)) { - System.out.println("inputWxData enter 1"); + // System.out.println("inputWxData enter 1"); List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("yn").is(1)), AntenatalExaminationModel.class); if (CollectionUtils.isNotEmpty(examinationModel)) { - System.out.println("inputWxData enter 2"); + // System.out.println("inputWxData enter 2"); for (AntenatalExaminationModel model : examinationModel) { if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckDate())) && DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) { @@ -1878,7 +1878,7 @@ public class AntExRecordFacade { } } if (falg) { - System.out.println("inputWxData enter chuzhen"); + // System.out.println("inputWxData enter chuzhen"); //创建一条复诊记录 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId).and("type").is(1).and("yn").is(1)), Patients.class); //当前医院没有档案,创建隐藏档案 @@ -1897,7 +1897,7 @@ public class AntExRecordFacade { } } if (null != patients) { - System.out.println("inputWxData enter patients"); + // System.out.println("inputWxData enter patients"); AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setPid(patients.getPid()); @@ -1905,7 +1905,7 @@ public class AntExRecordFacade { antExChuQuery.setCheckTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42)); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { - System.out.println("inputWxData enter antExChuModels"); + // System.out.println("inputWxData enter antExChuModels"); AntExChuModel antExChuModel = antExChuModels.get(0); AntExAddRequest antExAddRequest = new AntExAddRequest(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 84a3fd3..8e5358c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2622,7 +2622,7 @@ public class BabyBookbuildingFacade { //babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false)); // - System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); if (CollectionUtils.isNotEmpty(models)) { @@ -3701,7 +3701,7 @@ public class BabyBookbuildingFacade { babyQuery.setQueryNo(request.getQueryNo()); //滦平、隆化-儿保管理-全部 加健康/高危筛选 babyQuery.setHealthHigh(null != request.getHealthHigh() ? request.getHealthHigh() : null); - System.out.println("========" + babyQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println("========" + babyQuery.convertToQuery().convertToMongoQuery().toString()); //用隆华新口腔模块中数据筛选 牙齿异常2项,口腔阳性 if (null != request.getCyNumType() || null != request.getQcNumType() || StringUtils.isNotEmpty(request.getPositiveType())) { babyQuery.setOralCheckYn(YnEnums.YES.getId()); @@ -5685,7 +5685,7 @@ public class BabyBookbuildingFacade { map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheck.getCheckDate()));*/ } - System.out.println(dataMap.get("mainFoster")); + // System.out.println(dataMap.get("mainFoster")); if ("0".equals(dataMap.get("mainFoster"))) { dataMap.put("filiation", "父子"); } else if ("1".equals(dataMap.get("mainFoster"))) { @@ -5917,7 +5917,7 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isEmpty(dbList)) { BabyDiagnoseModel babyDiagnoseModel = model.convertToDataModel(); babyDiagnoseService.addBabyDiagnose(babyDiagnoseModel); - System.out.println("handleBabyDiagnose success " + model.getBlh()); + // System.out.println("handleBabyDiagnose success " + model.getBlh()); } } catch (Exception e) { ExceptionUtils.catchException(e, "handleBabyDiagnose error."); @@ -5977,8 +5977,8 @@ public class BabyBookbuildingFacade { String lrrqStart = DateUtil.getYyyyMMddHHssmm(start); String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end); - System.out.println("lrrqStart =" + lrrqStart); - System.out.println("lrrqEnd =" + lrrqEnd); + /* System.out.println("lrrqStart =" + lrrqStart); + System.out.println("lrrqEnd =" + lrrqEnd);*/ // int size = handleBabyDiagnose(lrrqStart, lrrqEnd); //秦皇岛诊断数据定时同步到mysql数据库中 int size1 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd, "1"); @@ -6016,7 +6016,7 @@ public class BabyBookbuildingFacade { babyModelQuery3.setMphone(phone); babyModelQuery3.setBuildType(2); List babyModels = babyService.queryBabyWithQuery(babyModelQuery3); - System.out.println(babyModelQuery3.convertToQuery().convertToMongoQuery().toString()); + //System.out.println(babyModelQuery3.convertToQuery().convertToMongoQuery().toString()); List datas = new ArrayList<>(); if (CollectionUtils.isNotEmpty(babyModels)) { for (BabyModel model : babyModels) { @@ -6433,7 +6433,7 @@ public class BabyBookbuildingFacade { // babyCheckModelQuery.setBirthEnd(currentDate); babyCheckModelQuery.setCheckDateStart(checkDateStart); babyCheckModelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(checkDateEnd)); - System.out.println(babyCheckModelQuery.convertToQuery().convertToMongoQuery().toString()); + //System.out.println(babyCheckModelQuery.convertToQuery().convertToMongoQuery().toString()); //List hashMaps = babyCheckService.babyCheckBuildIdGroup(babyCheckModelQuery); List checkModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery); List result = new ArrayList<>(); @@ -6948,7 +6948,7 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(list)) { //线程数 int threadCount = list.size() % BATCH_SIZE == 0 ? list.size() / BATCH_SIZE : list.size() / BATCH_SIZE + 1; - System.out.println("threadCount = " + threadCount); + // System.out.println("threadCount = " + threadCount); CountDownLatch countDownLatch = new CountDownLatch(threadCount); int end = 0; for (int i = 0; i < list.size(); i += BATCH_SIZE) { 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 b3b52ea..5726deb 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 @@ -22,6 +22,7 @@ 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.*; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; @@ -1335,7 +1336,7 @@ public class BookbuildingFacade { public void bookbuildingSyncMsg() { logger.info("bookbuildingMsg startup"); List hospitalList = new ArrayList<>(); - hospitalList.add("2100002419"); + hospitalList.add(OrganizationConstant.TY_DT); hospitalList.add("1000000016"); hospitalList.add("2100002421"); hospitalList.add("1000000115"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 99d68c2..bb88c0b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -8,6 +8,7 @@ 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.*; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -1633,7 +1634,7 @@ public class PatientServiceFacade { patientsQuery.setNeed("1"); patientsQuery.setPage(statisticsQueryRequest.getPage()); patientsQuery.setLimit(statisticsQueryRequest.getLimit()); - if ("2100002419".equals(hospitalId)){ + if (OrganizationConstant.TY_DT.equals(hospitalId)){ patientsQuery.setArchive(true); patientsQuery.setDtFm(true); } @@ -1879,7 +1880,7 @@ public class PatientServiceFacade { try { logger.info("sendServiceMsg startup"); List messages = new ArrayList<>(); - final String hospitalId = "2100002419"; + final String hospitalId = OrganizationConstant.TY_DT; MsgRequest request = new MsgRequest(); String title = "五色管理提醒短信"; String messageContent = "【大同市第一人民医院】提醒：请尽快完善信息享受五色高危管理服务，请点击以下链接截图保存二维码，用微信识别，关注“美生孕育”公众号，点击开通成功提醒《产科预约建档》，请您务必填写您就诊的医生姓名，信息填写完成后点击提交即可。等待10分钟就可以点击公众号的开通成功提醒《产科已有档案》，输入您建档时填写的姓名+手机号，获取验证码成功登录宝贝孕程小程序。请确保登录成功并持续关注“美生孕育”公众号，享受五色高危管理和个性化精准医疗服务。【https://dev-rp-api.healthbaby.com.cn/id_photo/2100002419/2100002419.png】"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 8b6eadd..7609233 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -668,6 +668,190 @@ public class RiskReportFacade { } + /** + * 五色管理 + * + * @return + */ + public BaseListResponse queryRiskCount(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setHospitalId(hospitalId); + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getType())) { + if ("2".equals(riskPatientsQueryRequest.getType())) { + //1孕妇 + patientsQuery.setType(1); + if ("2100002419".equals(hospitalId)){ + patientsQuery.setDtFm(true); + } + } else if ("3".equals(riskPatientsQueryRequest.getType())) { + //3产妇 + patientsQuery.setType(3); + } + } + //产检医生 + patientsQuery.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); + //最后一次检查时间 + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getLastCTime())) { + String nextDateStr = riskPatientsQueryRequest.getLastCTime(); + String[] dates = nextDateStr.split(" - "); + patientsQuery.setLastCTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + patientsQuery.setLastCTimeEnd(DateUtil.parseYMD(dates[1])); + } + } + + List results = new ArrayList<>(); + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID); + basicConfigQuery.setEnable(1); + basicConfigQuery.setId(riskPatientsQueryRequest.getrLevel()); + + List riskLevelConfig = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(riskLevelConfig)) { + riskLevelConfig=addRisk(riskLevelConfig); + for (BasicConfig levelConfig : riskLevelConfig) { + if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId())) { + continue; + } + //高危等级 + List levelList= StringUtils.covertToList(levelConfig.getId(), String.class); + if (levelList.size()==1){ + if (StringUtils.isEmpty(levelConfig.getLevel())){ + levelConfig.setLevel("1"); + } + //针对与单颜色做特殊处理 + patientsQuery.setAllPats("allPats,"+levelConfig.getLevel()); + }else { + patientsQuery.setAllPats(""); + } + patientsQuery.setrLevel(levelConfig.getId()); + int allPatientCount = patientsService.queryPatientCount(patientsQuery); + if (allPatientCount>0){ + RiskReportResult risk = new RiskReportResult(); + risk.setLevel(Integer.valueOf(levelConfig.getLevel())); + risk.setHighRiskId(levelConfig.getId()); + risk.setHighRisk(levelConfig.getName()); + risk.setPid(levelConfig.getpId()); + risk.setRiskCount(allPatientCount); + Map map = new HashMap(); + levelConfig.replenRisk(map); + risk.setHighLevel(Arrays.asList(new Map[]{map})); + results.add(risk); + } + } + } + return new BaseListResponse() + .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(results); + } + + private static List basicConfigs; + + private static List addRisk(List basicConfigList){ + + if (CollectionUtils.isNotEmpty(basicConfigs)){ + return basicConfigs; + }else { + basicConfigs=new ArrayList<>(); + } + + BasicConfig h =new BasicConfig(); + h.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + h.setLevel("2"); + h.setName("黄色"); + h.setId("315107bd-91fe-42a1-9237-752f3c046a40"); + basicConfigList.add(h); + BasicConfig hz =new BasicConfig(); + hz.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hz.setLevel("2"); + hz.setName("黄色-紫色"); + hz.setId("315107bd-91fe-42a1-9237-752f3c046a40,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(hz); + BasicConfig c =new BasicConfig(); + c.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + c.setLevel("2"); + c.setName("橙色"); + c.setId("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2"); + basicConfigList.add(c); + BasicConfig cz =new BasicConfig(); + cz.setName("橙色-紫色"); + cz.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + cz.setLevel("2"); + cz.setId("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(cz); + BasicConfig ch =new BasicConfig(); + ch.setName("橙色-黄色"); + ch.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + ch.setLevel("2"); + ch.setId("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2,315107bd-91fe-42a1-9237-752f3c046a40"); + basicConfigList.add(ch); + BasicConfig chz =new BasicConfig(); + chz.setName("橙色-黄色-紫色"); + chz.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + chz.setLevel("3"); + chz.setId("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2,315107bd-91fe-42a1-9237-752f3c046a40,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(chz); + BasicConfig hs =new BasicConfig(); + hs.setName("红色"); + hs.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hs.setLevel("2"); + hs.setId("eb146c03-b19f-4e28-b85f-fda574b2283b"); + basicConfigList.add(hs); + BasicConfig hz1 =new BasicConfig(); + hz1.setName("红色-紫色"); + hz1.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hz1.setLevel("2"); + hz1.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(hz1); + BasicConfig hh =new BasicConfig(); + hh.setName("红色-黄色"); + hh.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hh.setLevel("2"); + hh.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,315107bd-91fe-42a1-9237-752f3c046a40"); + basicConfigList.add(hh); + BasicConfig hc =new BasicConfig(); + hc.setName("红色-橙色"); + hc.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hc.setLevel("2"); + hc.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,49a36aea-c5b6-4162-87d2-9eb3c6ec00c2"); + basicConfigList.add(hc); + BasicConfig hcz =new BasicConfig(); + hcz.setName("红色-橙色-紫色"); + hcz.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hcz.setLevel("2"); + hcz.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,49a36aea-c5b6-4162-87d2-9eb3c6ec00c2,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(hcz); + BasicConfig hhz =new BasicConfig(); + hhz.setName("红色-黄色-紫色"); + hhz.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hhz.setLevel("3"); + hhz.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,315107bd-91fe-42a1-9237-752f3c046a40,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(hhz); + BasicConfig hch =new BasicConfig(); + hch.setName("红色-橙色-黄色"); + hch.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hch.setLevel("3"); + hch.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,49a36aea-c5b6-4162-87d2-9eb3c6ec00c2,315107bd-91fe-42a1-9237-752f3c046a40"); + basicConfigList.add(hch); + BasicConfig hchz =new BasicConfig(); + hchz.setName("红色-橙色-黄色-紫色"); + hchz.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + hchz.setLevel("3"); + hchz.setId("eb146c03-b19f-4e28-b85f-fda574b2283b,49a36aea-c5b6-4162-87d2-9eb3c6ec00c2,315107bd-91fe-42a1-9237-752f3c046a40,224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(hchz); + BasicConfig z =new BasicConfig(); + z.setName("紫色"); + z.setpId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + z.setLevel("2"); + z.setId("224b2329-cb82-4da3-a071-8527f8283aab"); + basicConfigList.add(z); + basicConfigs.addAll(basicConfigList); + return basicConfigs; + } + + //无层级关系 public void configSignData(RiskReportResult bs, int allPatientCount) { DecimalFormat df = new DecimalFormat("0.00"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FileUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FileUtils.java index 7419265..d0cd0cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FileUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FileUtils.java @@ -70,7 +70,7 @@ public class FileUtils { sourceDir.delete(); destOutputStream.flush(); destOutputStream.close(); - System.out.println(("上传文件完成")); + //System.out.println(("上传文件完成")); return false; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java index 9027939..f865f41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PatientRelateMemberUtil.java @@ -31,7 +31,7 @@ public class PatientRelateMemberUtil { client.executeMethod(get); int statusCode = get.getStatusCode(); - System.out.println("statusCode:" + statusCode); + // System.out.println("statusCode:" + statusCode); String result = new String(get.getResponseBodyAsString()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ChaseVisitHistory.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ChaseVisitHistory.java index 9ecce6f..e54e616 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ChaseVisitHistory.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ChaseVisitHistory.java @@ -58,7 +58,7 @@ public class ChaseVisitHistory implements Callable> { residentsArchiveService.updateResident(archive, archive.getId()); i++; } - System.out.println("妇女数据已处理=====》" + i); + // System.out.println("妇女数据已处理=====》" + i); data.put("woman", archiveModel.size()); return data; }