From 29204160e06d3e4ace3050080319d1245aea5c51 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 10 Aug 2021 16:09:31 +0800 Subject: [PATCH] update --- .../lyms/platform/biz/BasicConfigServiceTest.java | 74 +++++++++++++- .../lyms/platform/permission/model/MysqlBaby.java | 10 +- .../resources/mainOrm/master/MasterMysqlAntexc.xml | 2 + .../lyms/platform/pojo/HightWeightWeekModel.java | 108 +++++++++++++++++++++ .../com/lyms/hospitalapi/hs/HsfyFmService.java | 2 +- .../web/controller/PuerperaManageController.java | 4 +- .../operate/web/controller/TestController.java | 34 +++---- .../operate/web/facade/PatientSyncMysqlFacade.java | 43 ++++---- .../web/service/impl/PatientWeightServiceImpl.java | 33 +++++-- 9 files changed, 262 insertions(+), 48 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/HightWeightWeekModel.java 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 f8ddf03..aba66f5 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 @@ -7037,8 +7037,79 @@ public class BasicConfigServiceTest { } } + + public static void saveHightWeightInfo(String fileName) { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); + MongoTemplate mongoTemplate + = (MongoTemplate) applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + File file = new File(fileName); + Workbook wb = null; + try { + wb = Workbook.getWorkbook(file); + + Sheet s = wb.getSheet(0); + System.out.println(s.getName() + " : "); + int rows = s.getRows(); + if (rows > 0) { + //遍历每行 + for (int i = 1; i < rows; i++) { + System.out.println("rows=" + i); + HightWeightWeekModel hightWeightWeekModel = new HightWeightWeekModel(); + hightWeightWeekModel.setType(1); + Cell[] cells = s.getRow(i); + if (cells.length > 0) { + for (int j = 0; j < cells.length; j++) { + + String str = cells[j].getContents().trim(); + switch (j) { + case 0: + hightWeightWeekModel.setKcal(str); + continue; + case 1: + hightWeightWeekModel.setWeek(str); + continue; + case 2: + List list1 = Arrays.asList(str.split("\n")); + hightWeightWeekModel.setBreakfast(list1); + continue; + case 3: + List list2 = Arrays.asList(str.split("\n")); + hightWeightWeekModel.setBreakfastAdd(list2); + continue; + + case 4: + List list3 = Arrays.asList(str.split("\n")); + hightWeightWeekModel.setLunch(list3); + continue; + + case 5: + List list4 = Arrays.asList(str.split("\n")); + hightWeightWeekModel.setLunchAdd(list4); + continue; + + case 6: + List list5 = Arrays.asList(str.split("\n")); + hightWeightWeekModel.setDinner(list5); + continue; + + case 7: + List list6 = Arrays.asList(str.split("\n")); + hightWeightWeekModel.setDinnerAdd(list6); + continue; + } + } + } + mongoTemplate.save(hightWeightWeekModel); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void main(String[] args) { - handle(); +// handle(); // getData(); //weightWeek("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls"); // weightMange("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls"); @@ -7094,6 +7165,7 @@ public class BasicConfigServiceTest { // saveDdb1("F:\\体重与营养管理\\低蛋白.xls"); // saveBabyHeartStandardModel("C:\\Users\\Administrator\\Desktop\\儿心量表打印添加内容.xls");//儿心量表标准 + saveHightWeightInfo("F:\\体重与营养管理\\定制高危糖尿病一周食谱(1)(1).xls");//定制高危糖尿病一周食谱 } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MysqlBaby.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MysqlBaby.java index 3927f92..7806868 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MysqlBaby.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/MysqlBaby.java @@ -62,10 +62,18 @@ public class MysqlBaby { private Date buildDate; // '建档日期', private String vcCardNo; // '就诊卡号', private String remark; // '备注', - private String couponCode; // '优惠劵号码', + private String hospitalId; // '优惠劵号码', + private String couponCode; // '医院id', private Date created; private Date modified; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public String getBabyId() { return babyId; diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml index 340c97e..175dc50 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -648,6 +648,7 @@ vcCardNo, remark, couponCode, + hospitalId, created, modified )VALUES ( @@ -707,6 +708,7 @@ #{vcCardNo}, #{remark}, #{couponCode}, + #{hospitalId}, #{created}, #{modified} ) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/HightWeightWeekModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/HightWeightWeekModel.java new file mode 100644 index 0000000..8b2b18d --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/HightWeightWeekModel.java @@ -0,0 +1,108 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.List; + +/** + *定制高危糖尿病一周食谱 + */ +@Document(collection = "lyms_hw_week_config") +public class HightWeightWeekModel extends BaseModel { + + private String id; + + private String kcal; + private String week; + //0 糖尿病 + private Integer type; + private List breakfast;//早餐 + private List breakfastAdd;//上午加餐 + private List lunch;//午餐 + private List lunchAdd;//下午加餐 + private List dinner;//晚餐 + private List dinnerAdd;//晚加餐 + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getKcal() { + return kcal; + } + + public void setKcal(String kcal) { + this.kcal = kcal; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public List getBreakfast() { + return breakfast; + } + + public void setBreakfast(List breakfast) { + this.breakfast = breakfast; + } + + public List getBreakfastAdd() { + return breakfastAdd; + } + + public void setBreakfastAdd(List breakfastAdd) { + this.breakfastAdd = breakfastAdd; + } + + public List getLunch() { + return lunch; + } + + public void setLunch(List lunch) { + this.lunch = lunch; + } + + public List getLunchAdd() { + return lunchAdd; + } + + public void setLunchAdd(List lunchAdd) { + this.lunchAdd = lunchAdd; + } + + public List getDinner() { + return dinner; + } + + public void setDinner(List dinner) { + this.dinner = dinner; + } + + public List getDinnerAdd() { + return dinnerAdd; + } + + public void setDinnerAdd(List dinnerAdd) { + this.dinnerAdd = dinnerAdd; + } +} + + diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java index da7453c..ec8174f 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java @@ -302,7 +302,7 @@ public class HsfyFmService { deliverAddRequest.setDueWeek(week); } -// deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1) + deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1) // Integer placenta_Num = allFm.getPLACENTA_NUM(); // if(placenta_Num!=null){ // deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) 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 838a61a..4adacc4 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 @@ -703,8 +703,8 @@ public class PuerperaManageController extends BaseController { String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); if ("2100001377".equals(hospitalId)) { - header.put("prodDoctor", "初诊时间"); - header.put("checkTime", "初诊医生"); + header.put("prodDoctor", "初诊医生"); + header.put("checkTime", "初诊时间"); } header.put("phone", "联系方式"); 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 0d01466..caafd21 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 @@ -4212,43 +4212,43 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncPatients", method = RequestMethod.GET) - public String syncPatients(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { - patientSyncMysqlFacade.syncPatients(startDate, endDate); + public String syncPatients(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { + patientSyncMysqlFacade.syncPatients(startDate, endDate, hospitalId); return "success"; } @ResponseBody @RequestMapping(value = "/syncAntexc", method = RequestMethod.GET) - public String syncAntexc(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { - patientSyncMysqlFacade.syncAntexc(startDate, endDate); + public String syncAntexc(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { + patientSyncMysqlFacade.syncAntexc(startDate, endDate, hospitalId); return "success"; } @ResponseBody @RequestMapping(value = "/syncAntex", method = RequestMethod.GET) - public String syncAntex(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { - patientSyncMysqlFacade.syncAntex(startDate, endDate); + public String syncAntex(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { + patientSyncMysqlFacade.syncAntex(startDate, endDate, hospitalId); return "success"; } @ResponseBody @RequestMapping(value = "/syncMatdeliver", method = RequestMethod.GET) - public String syncMatdeliver(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { - patientSyncMysqlFacade.syncMatdeliver(startDate, endDate); + public String syncMatdeliver(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { + patientSyncMysqlFacade.syncMatdeliver(startDate, endDate, hospitalId); return "success"; } @ResponseBody @RequestMapping(value = "/syncBaby", method = RequestMethod.GET) - public String syncBaby(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { - patientSyncMysqlFacade.syncBaby(startDate, endDate); + public String syncBaby(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { + patientSyncMysqlFacade.syncBaby(startDate, endDate, hospitalId); return "success"; } @ResponseBody @RequestMapping(value = "/syncBabyCheck", method = RequestMethod.GET) - public String syncBabyCheck(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { - patientSyncMysqlFacade.syncBabyCheck(startDate, endDate); + public String syncBabyCheck(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { + patientSyncMysqlFacade.syncBabyCheck(startDate, endDate, hospitalId); return "syncBabyCheck"; } @@ -4256,7 +4256,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncPatientsToMysql", method = RequestMethod.GET) - public String syncPatientsToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { + public String syncPatientsToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { patientSyncMysqlFacade.syncPatientsToMysql(startDate, endDate); return "syncPatientsToMysql"; } @@ -4265,7 +4265,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncAntexchuToMysql", method = RequestMethod.GET) - public String syncAntexchuToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { + public String syncAntexchuToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { patientSyncMysqlFacade.syncAntexchuToMysql(startDate, endDate); return "syncAntexchuToMysql"; } @@ -4274,7 +4274,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncAntexToMysql", method = RequestMethod.GET) - public String syncAntexToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { + public String syncAntexToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { patientSyncMysqlFacade.syncAntexToMysql(startDate, endDate); return "syncAntexToMysql"; } @@ -4284,7 +4284,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncMatdeliverToMysql", method = RequestMethod.GET) - public String syncMatdeliverToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { + public String syncMatdeliverToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { patientSyncMysqlFacade.syncMatdeliverToMysql(startDate, endDate); return "syncMatdeliverToMysql"; } @@ -4293,7 +4293,7 @@ public class TestController extends BaseController { @ResponseBody @RequestMapping(value = "/syncAllToMysql", method = RequestMethod.GET) - public String syncAllToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) { + public String syncAllToMysql(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate,@RequestParam(required = false) String hospitalId) { patientSyncMysqlFacade.syncPatientsToMysql(startDate, endDate); patientSyncMysqlFacade.syncMatdeliverToMysql(startDate, endDate); patientSyncMysqlFacade.syncAntexchuToMysql(startDate, endDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index feed4e4..3d11f5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -84,7 +84,7 @@ public class PatientSyncMysqlFacade { /** * 档案 */ - public void syncPatients(Date start,Date end) + public void syncPatients(Date start,Date end,String hospitalId) { PatientsQuery puerperaQuery = new PatientsQuery(); puerperaQuery.setGteCreated(start); @@ -93,7 +93,8 @@ public class PatientSyncMysqlFacade { puerperaQuery.setExtEnable(false); puerperaQuery.setBuildTypeNot(1); puerperaQuery.setYn(YnEnums.YES.getId()); - puerperaQuery.setHospitalId("2100001377"); + + puerperaQuery.setHospitalId(hospitalId); System.out.println("syncPatients "+puerperaQuery.convertToQuery().convertToMongoQuery().toString()); List patientses = patientsService.queryPatient(puerperaQuery); @@ -155,10 +156,10 @@ public class PatientSyncMysqlFacade { /** * 初诊 */ - public void syncAntexc(Date start,Date end) + public void syncAntexc(Date start,Date end,String hospitalId) { AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setHospitalId("2100001377"); + antExChuQuery.setHospitalId(hospitalId); if (start != null) { antExChuQuery.setCreatedTimeStart(start); @@ -304,11 +305,11 @@ public class PatientSyncMysqlFacade { } - public void syncAntex(Date start,Date end) + public void syncAntex(Date start,Date end,String hospitalId) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId("2100001377"); + antExQuery.setHospitalId(hospitalId); if (start != null) { @@ -459,11 +460,11 @@ public class PatientSyncMysqlFacade { } - public void syncMatdeliver(Date start,Date end) + public void syncMatdeliver(Date start,Date end,String hospitalId) { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setHospitalId("2100001377"); + matDeliverQuery.setHospitalId(hospitalId); if (start != null) { matDeliverQuery.setCreatedTimeStart(start); @@ -657,11 +658,11 @@ public class PatientSyncMysqlFacade { - public void syncBaby(Date start,Date end) + public void syncBaby(Date start,Date end,String hospitalId) { BabyModelQuery babyBuildQuery = new BabyModelQuery(); babyBuildQuery.setYn(YnEnums.YES.getId()); - babyBuildQuery.setHospitalId("2100001377"); + babyBuildQuery.setHospitalId(hospitalId); if (start != null) { babyBuildQuery.setCreatedTimeStart(start); @@ -731,10 +732,10 @@ public class PatientSyncMysqlFacade { } - public void syncBabyCheck(Date start,Date end) + public void syncBabyCheck(Date start,Date end,String hospitalId) { BabyCheckModelQuery query = new BabyCheckModelQuery(); - query.setHospitalId("2100001377"); + query.setHospitalId(hospitalId); if (start != null) { @@ -1265,14 +1266,20 @@ public class PatientSyncMysqlFacade { { System.out.println("syncLpData start ........"); + List hospitalIds = Arrays.asList("2100001377","2100001452");//滦平妇幼和围场满族蒙古族自治县妇幼保健院 + Date startDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); Date endDate = DateUtil.addDay(startDate, 1); - syncPatients(startDate,endDate); - syncAntexc(startDate, endDate); - syncAntex(startDate, endDate); - syncMatdeliver(startDate, endDate); - syncBaby(startDate, endDate); - syncBabyCheck(startDate, endDate); + for (String hid : hospitalIds) + { + syncPatients(startDate,endDate,hid); + syncAntexc(startDate, endDate,hid); + syncAntex(startDate, endDate,hid); + syncMatdeliver(startDate, endDate,hid); + syncBaby(startDate, endDate,hid); + syncBabyCheck(startDate, endDate,hid); + } + System.out.println("syncLpData end ........"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 7407280..f031da9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -2943,19 +2943,21 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (reiskFactor.isEmpty() && weightReport.isEmpty()) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("对象值为空!").setData(""); } else { - for (String reis : reiskFactor) { - - //如果是妊娠期糖尿病病史 改成和 妊娠期糖尿病（无需药物治疗）取一样的内容 - if ("5bbc0fff422b03d4ad2bf955".equals(reis)) - { - reis = "5aab6d3d422b03d4ad2bf83e"; - } + //如果是妊娠期糖尿病病史 改成和 妊娠期糖尿病（无需药物治疗）取一样的内容 + if (reiskFactor.contains("5bbc0fff422b03d4ad2bf955")) + { + reiskFactor.add("5aab6d3d422b03d4ad2bf83e"); + reiskFactor.remove("5bbc0fff422b03d4ad2bf955"); + } + for (String reis : reiskFactor) { for (WeightReportModel weightReportModel : weightReport) { if (reis.equals(weightReportModel.getgDMId()) || reis.equals(weightReportModel.getoDIPId()) || reis.equals(weightReportModel.getMedicationDiabetesID())) { //糖尿病diabetes - datas.put("1", this.getDiabetestInfo(weights, data3, weightReportModel, patientWeight, patients, bmiD, week, diabetesKcalStr)); + Map map = this.getDiabetestInfo(weights, data3, weightReportModel, patientWeight, patients, bmiD, week, diabetesKcalStr); + map = getWeekInfo(diabetesKcal,map,reiskFactor); + datas.put("1", map); } else if (reis.equals(weightReportModel.getGestationalHypertensionGHID()) || reis.equals(weightReportModel.getChronicHypertensionID())) { //高血压hypertension datas.put("3", this.getInfo(weights, data2, weightReportModel, patientWeight, patients, bmiD, week, gxyKcalStr)); @@ -3122,6 +3124,21 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); } + private Map getWeekInfo(Integer kcal,Map map,List risks) + { + List weightReport = null; + if (risks.contains("5aab6d3d422b03d4ad2bf83e") && (risks.contains("5aab6d3e422b03d4ad2bf83f") + //需药物治疗的糖尿病 + || risks.contains("de7468e6-1bb5-4fab-ae84-78857868409a"))) + { + String k = (kcal < 1500 ? 1500 : (kcal > 2300 ? 2300 : kcal))+"kcal"; + weightReport = mongoTemplate.find(Query.query(Criteria.where("kcal").is(k).and("type").is(1)), HightWeightWeekModel.class); + } + + map.put("weekInfo", CollectionUtils.isNotEmpty(weightReport) ? weightReport : null); + return map; + } + /** * 秦皇岛高危报告 */ -- 1.8.3.1