diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 752c309..5b19786 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -727,7 +727,6 @@ public class DateUtil { if (birth.getTime() > rightNow1.getTime().getTime()) { - int month = getMonthSpace(birth,checkDate); Calendar yearNow = Calendar.getInstance(); yearNow.setTime(birth); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 2f3ef05..3daad3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -1,12 +1,12 @@ package com.lyms.platform.operate.web; -import com.lyms.platform.common.enums.ChildCareEnums; -import com.lyms.platform.common.utils.EnumUtil; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.BasicConfig; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.Map; @@ -20,9 +20,20 @@ public class Test { public static void main(String[] args) throws Exception { //月龄套餐 //月龄套餐 - List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); - System.out.println(jctc); + // List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); + // System.out.println(jctc); + int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date()); + System.out.println(day); + + // String yl = DateUtil.getBabyMonthAge(DateUtil.parseYMD("2018-04-10"),new Date()); + // System.out.println(yl); + // String checkMonthAge = "1岁2月龄"; + // checkMonthAge = checkMonthAge.substring(checkMonthAge.indexOf("龄")+1,checkMonthAge.indexOf("天")); + // System.out.println(checkMonthAge); + + // String dayStr = checkMonthAge.substring(checkMonthAge.indexOf("岁") + 1, checkMonthAge.length()-2); + // System.out.println(dayStr); /* Mongo mongo = new Mongo("119.90.57.26", 10001); UserCredentials credentials = new UserCredentials("platform", "platform123"); 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 9993e15..3300e70 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 @@ -49,7 +49,6 @@ public class PuerperaManageController extends BaseController { /** * 产妇管理查询接口 - * * @param managerRequest * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 333b274..f031910 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -690,6 +690,7 @@ public class BabyCheckFacade { checkRecord.put("buildId", cmodel.getBuildId()); checkRecord.put("type", "2"); + checkRecord.put("tcType", cmodel.getTcType()==null?"":cmodel.getTcType()+""); checkRecord.put("hospitalId", models.get(0).getHospitalId()); //查询建档医院 Organization org = organizationService.getOrganization(Integer.valueOf(models.get(0).getHospitalId())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 26aaeb7..69b1db4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -284,7 +284,7 @@ public class ViewFacade { List> listOtherRisk = new ArrayList<>(); ResolveUtils.queryOtherRisk(oRisk, listOtherRisk); - for (Map otherRisk:listOtherRisk) { + for (Map otherRisk : listOtherRisk) { if (otherRisk != null) { if (otherRisk.get("score") != null && StringUtils.isNotEmpty(otherRisk.get("score").toString())) { String s = (String) otherRisk.get("score"); @@ -849,7 +849,7 @@ public class ViewFacade { } } - /* 辅助检查 */ + /* 辅助检查 */ if (StringUtils.isNotEmpty(data.getXhdb())) { @@ -3099,6 +3099,71 @@ public class ViewFacade { BabyCheckPageResult model = new BabyCheckPageResult(); if (babyModel != null) { + if (checkModel.getTcType() == null) {//历史数据不存在套餐处理成一个规则 + if ("216".equals(checkModel.getHospitalId())) {//秦皇岛医院处理规则 + //月份 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), checkModel.getCheckDate()); + //天数 + int day = DateUtil.getExcludeMonthDay(babyModel.getBirth(), checkModel.getCheckDate()); + + if (monthNum < 2 || (monthNum == 2 && day <= 10)) { + model.setTcType(ChildCareEnums.JCTCEnums.A.getId()); + } else if (monthNum < 4 || (monthNum == 4 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.B.getId()); + } else if (monthNum < 7 || (monthNum == 7 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.C.getId()); + } else if (monthNum < 10 || (monthNum == 10 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.D.getId()); + } else if (monthNum < 16 || (monthNum == 16 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.E.getId()); + } else if (monthNum < 21 || (monthNum == 21 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.F.getId()); + } else if (monthNum < 27 || (monthNum == 27 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.G.getId()); + } else if (monthNum < 33 || (monthNum == 33 && day <= 20)) { + model.setTcType(ChildCareEnums.JCTCEnums.H.getId()); + } + } else {//其他医院规则 + //月份 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), checkModel.getCheckDate()); + + if (monthNum < 3) { + model.setTcType(ChildCareEnums.JCTCEnums.A.getId()); + } else if (monthNum < 6) { + model.setTcType(ChildCareEnums.JCTCEnums.B.getId()); + } else if (monthNum < 8) { + model.setTcType(ChildCareEnums.JCTCEnums.C.getId()); + } else if (monthNum < 12) { + model.setTcType(ChildCareEnums.JCTCEnums.D.getId()); + } else if (monthNum < 18) { + model.setTcType(ChildCareEnums.JCTCEnums.E.getId()); + } else if (monthNum < 24) { + model.setTcType(ChildCareEnums.JCTCEnums.F.getId()); + } else if (monthNum < 30) { + model.setTcType(ChildCareEnums.JCTCEnums.G.getId()); + } else if (monthNum < 36) { + model.setTcType(ChildCareEnums.JCTCEnums.H.getId()); + } + } + String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate()); + if (StringUtils.isNotEmpty(checkMonthAge)) { + if (checkMonthAge.indexOf("岁") != -1) { + String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁")); + int year = Integer.parseInt(yearStr); + if (year == 3) { + model.setTcType(ChildCareEnums.JCTCEnums.I.getId()); + } else if (year == 4) { + model.setTcType(ChildCareEnums.JCTCEnums.J.getId()); + } else if (year == 5) { + model.setTcType(ChildCareEnums.JCTCEnums.K.getId()); + } else if (year == 6) { + model.setTcType(ChildCareEnums.JCTCEnums.L.getId()); + } + } + } + } + + model.setBabyName(babyModel.getName()); model.setBabyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); model.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); @@ -3171,11 +3236,10 @@ public class ViewFacade { model.setTcType(checkModel.getTcType()); - model.setCnqk(checkModel.getCnqk()); - model.setMtcnNum( UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI)); + model.setMtcnNum(UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI)); model.setXbNum(UnitUtils.unitSplice(checkModel.getXbNum(), UnitConstants.CI)); - model.setDbNum( UnitUtils.unitSplice(checkModel.getDbNum(), UnitConstants.CI)); + model.setDbNum(UnitUtils.unitSplice(checkModel.getDbNum(), UnitConstants.CI)); model.setQdtlTime(checkModel.getQdtlTime()); model.setPfhrTime(checkModel.getPfhrTime()); model.setWssAd(checkModel.getWssAd()); @@ -3191,7 +3255,6 @@ public class ViewFacade { model.setNd(UnitUtils.unitSplice(checkModel.getNd(), UnitConstants.GG)); - model.setYgbmky(FunvCommonUtil.checkYiGan(checkModel.getYgbmky())); model.setYgeky(FunvCommonUtil.checkYiGan(checkModel.getYgeky())); model.setYgekt(FunvCommonUtil.checkYiGan(checkModel.getYgekt())); @@ -3212,9 +3275,9 @@ public class ViewFacade { model.setYghxktNum(checkModel.getYghxktNum()); model.setXqgbzam(UnitUtils.unitSplice(checkModel.getXqgbzam(), UnitConstants.UL)); - model.setXqgczam( UnitUtils.unitSplice(checkModel.getXqgczam(), UnitConstants.UL)); + model.setXqgczam(UnitUtils.unitSplice(checkModel.getXqgczam(), UnitConstants.UL)); model.setAlbumin(UnitUtils.unitSplice(checkModel.getAlbumin(), UnitConstants.UL)); - model.setTotalBilirubin( UnitUtils.unitSplice(checkModel.getTotalBilirubin(), UnitConstants.UL)); + model.setTotalBilirubin(UnitUtils.unitSplice(checkModel.getTotalBilirubin(), UnitConstants.UL)); model.setJhBilirubin(UnitUtils.unitSplice(checkModel.getJhBilirubin(), UnitConstants.UL)); model.setBcgYs(checkModel.getBcgYs()); @@ -3291,7 +3354,9 @@ public class ViewFacade { model.setWeight(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getWeight(), UnitConstants.KG)); model.setHead(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHead(), UnitConstants.CM)); model.setHeightWeight(checkModel.getHeightWeight()); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate())) { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate())) + + { List list = JsonUtil.toList(checkModel.getGrowthEvaluate(), String.class); if (CollectionUtils.isNotEmpty(list)) { @@ -3310,15 +3375,21 @@ public class ViewFacade { String bilirubin = ""; - if (StringUtils.isNotEmpty(checkModel.getBilirubinHead())) { + if (StringUtils.isNotEmpty(checkModel.getBilirubinHead())) + + { bilirubin += " 头" + checkModel.getBilirubinHead() + " mg/dl"; } - if (StringUtils.isNotEmpty(checkModel.getBilirubinChest())) { + if (StringUtils.isNotEmpty(checkModel.getBilirubinChest())) + + { bilirubin += " 胸" + checkModel.getBilirubinChest() + " mg/dl"; } - if (StringUtils.isNotEmpty(checkModel.getBilirubinBelly())) { + if (StringUtils.isNotEmpty(checkModel.getBilirubinBelly())) + + { bilirubin += " 腹" + checkModel.getBilirubinBelly() + " mg/dl"; } @@ -3326,7 +3397,9 @@ public class ViewFacade { String bregma = ""; String bregmaValue = ""; - if (StringUtils.isNotEmpty(checkModel.getBregma())) { + if (StringUtils.isNotEmpty(checkModel.getBregma())) + + { Map map = JsonUtil.str2Obj(checkModel.getBregma(), Map.class); String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString(); if ("yes".equals(yesOrNo)) { @@ -3371,7 +3444,9 @@ public class ViewFacade { model.setOtherUrine(checkModel.getOtherUrine()); String diagnoseStr = checkModel.getDiagnose(); String diagnoseValue = ""; - if (!com.lyms.platform.common.utils.StringUtils.isEmpty(diagnoseStr)) { + if (!com.lyms.platform.common.utils.StringUtils.isEmpty(diagnoseStr)) + + { List diagnoses = JsonUtil.toList(diagnoseStr, List.class); for (int i = 0; i < diagnoses.size(); i++) { if (diagnoses.get(i) != null) { @@ -3395,7 +3470,9 @@ public class ViewFacade { model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getCheckDoctor())) { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getCheckDoctor())) + + { if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(checkModel.getCheckDoctor())) { model.setCheckDoctor("产科病房"); @@ -3409,7 +3486,9 @@ public class ViewFacade { } - if (StringUtils.isNotEmpty(checkModel.getHospitalId())) { + if (StringUtils.isNotEmpty(checkModel.getHospitalId())) + + { Organization organization = organizationService.getOrganization(Integer.parseInt(checkModel.getHospitalId())); if (organization != null && organization.getYn() == YnEnums.YES.getId()) { model.setCheckHospital(organization.getName()); @@ -3422,7 +3501,9 @@ public class ViewFacade { String drugGllergic = ""; - if (StringUtils.isNotEmpty(checkModel.getDrugGllergic())) { + if (StringUtils.isNotEmpty(checkModel.getDrugGllergic())) + + { Map map = JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class); String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); if ("no".equals(yesOrNo)) { @@ -3445,7 +3526,7 @@ public class ViewFacade { String qt = map.get("qt") == null ? "" : map.get("qt").toString(); if ("true".equals(qt)) { String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString(); - drugGllergic += " " + qtText+","; + drugGllergic += " " + qtText + ","; } drugGllergic = FunvCommonUtil.spitd(drugGllergic); } @@ -4130,7 +4211,7 @@ public class ViewFacade { map.put("husbandCardNo", data.getHcertificateNum()); map.put("husbandPhone", data.getHusbandPhone()); - map.put("hworkUnit",data.getHworkUnit()); + map.put("hworkUnit", data.getHworkUnit()); br.setData(map); br.setErrorcode(ErrorCodeConstants.SUCCESS);