Commit 05f6879fa7a70ab6fa95dcde1690b6fce5946e87

Authored by yangfei
1 parent ab9d833131
Exists in master and in 1 other branch dev

根据月龄生成儿保表单

Showing 5 changed files with 116 additions and 25 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 05f6879
... ... @@ -727,7 +727,6 @@
727 727  
728 728 if (birth.getTime() > rightNow1.getTime().getTime())
729 729 {
730   -
731 730 int month = getMonthSpace(birth,checkDate);
732 731 Calendar yearNow = Calendar.getInstance();
733 732 yearNow.setTime(birth);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java View file @ 05f6879
1 1 package com.lyms.platform.operate.web;
2 2  
3   -import com.lyms.platform.common.enums.ChildCareEnums;
4   -import com.lyms.platform.common.utils.EnumUtil;
  3 +import com.lyms.platform.common.utils.DateUtil;
5 4 import com.lyms.platform.pojo.BasicConfig;
6 5 import net.sourceforge.pinyin4j.PinyinHelper;
7 6 import org.apache.log4j.Logger;
8 7  
9 8 import java.util.Comparator;
  9 +import java.util.Date;
10 10 import java.util.List;
11 11 import java.util.Map;
12 12  
13 13  
... ... @@ -20,9 +20,20 @@
20 20 public static void main(String[] args) throws Exception {
21 21 //月龄套餐
22 22 //月龄套餐
23   - List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class);
24   - System.out.println(jctc);
  23 + // List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class);
  24 + // System.out.println(jctc);
25 25  
  26 + int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date());
  27 + System.out.println(day);
  28 +
  29 + // String yl = DateUtil.getBabyMonthAge(DateUtil.parseYMD("2018-04-10"),new Date());
  30 + // System.out.println(yl);
  31 + // String checkMonthAge = "1岁2月龄";
  32 + // checkMonthAge = checkMonthAge.substring(checkMonthAge.indexOf("龄")+1,checkMonthAge.indexOf("天"));
  33 + // System.out.println(checkMonthAge);
  34 +
  35 + // String dayStr = checkMonthAge.substring(checkMonthAge.indexOf("岁") + 1, checkMonthAge.length()-2);
  36 + // System.out.println(dayStr);
26 37  
27 38 /* Mongo mongo = new Mongo("119.90.57.26", 10001);
28 39 UserCredentials credentials = new UserCredentials("platform", "platform123");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 05f6879
... ... @@ -49,7 +49,6 @@
49 49  
50 50 /**
51 51 * 产妇管理查询接口
52   - *
53 52 * @param managerRequest
54 53 * @return
55 54 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 05f6879
... ... @@ -690,6 +690,7 @@
690 690 checkRecord.put("buildId", cmodel.getBuildId());
691 691 checkRecord.put("type", "2");
692 692  
  693 + checkRecord.put("tcType", cmodel.getTcType()==null?"":cmodel.getTcType()+"");
693 694 checkRecord.put("hospitalId", models.get(0).getHospitalId());
694 695 //查询建档医院
695 696 Organization org = organizationService.getOrganization(Integer.valueOf(models.get(0).getHospitalId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 05f6879
... ... @@ -284,7 +284,7 @@
284 284 List<Map<String, Object>> listOtherRisk = new ArrayList<>();
285 285 ResolveUtils.queryOtherRisk(oRisk, listOtherRisk);
286 286  
287   - for (Map<String, Object> otherRisk:listOtherRisk) {
  287 + for (Map<String, Object> otherRisk : listOtherRisk) {
288 288 if (otherRisk != null) {
289 289 if (otherRisk.get("score") != null && StringUtils.isNotEmpty(otherRisk.get("score").toString())) {
290 290 String s = (String) otherRisk.get("score");
... ... @@ -849,7 +849,7 @@
849 849 }
850 850 }
851 851  
852   - /* 辅助检查 */
  852 + /* 辅助检查 */
853 853 if (StringUtils.isNotEmpty(data.getXhdb()))
854 854  
855 855 {
... ... @@ -3099,6 +3099,71 @@
3099 3099 BabyCheckPageResult model = new BabyCheckPageResult();
3100 3100  
3101 3101 if (babyModel != null) {
  3102 + if (checkModel.getTcType() == null) {//历史数据不存在套餐处理成一个规则
  3103 + if ("216".equals(checkModel.getHospitalId())) {//秦皇岛医院处理规则
  3104 + //月份
  3105 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), checkModel.getCheckDate());
  3106 + //天数
  3107 + int day = DateUtil.getExcludeMonthDay(babyModel.getBirth(), checkModel.getCheckDate());
  3108 +
  3109 + if (monthNum < 2 || (monthNum == 2 && day <= 10)) {
  3110 + model.setTcType(ChildCareEnums.JCTCEnums.A.getId());
  3111 + } else if (monthNum < 4 || (monthNum == 4 && day <= 20)) {
  3112 + model.setTcType(ChildCareEnums.JCTCEnums.B.getId());
  3113 + } else if (monthNum < 7 || (monthNum == 7 && day <= 20)) {
  3114 + model.setTcType(ChildCareEnums.JCTCEnums.C.getId());
  3115 + } else if (monthNum < 10 || (monthNum == 10 && day <= 20)) {
  3116 + model.setTcType(ChildCareEnums.JCTCEnums.D.getId());
  3117 + } else if (monthNum < 16 || (monthNum == 16 && day <= 20)) {
  3118 + model.setTcType(ChildCareEnums.JCTCEnums.E.getId());
  3119 + } else if (monthNum < 21 || (monthNum == 21 && day <= 20)) {
  3120 + model.setTcType(ChildCareEnums.JCTCEnums.F.getId());
  3121 + } else if (monthNum < 27 || (monthNum == 27 && day <= 20)) {
  3122 + model.setTcType(ChildCareEnums.JCTCEnums.G.getId());
  3123 + } else if (monthNum < 33 || (monthNum == 33 && day <= 20)) {
  3124 + model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
  3125 + }
  3126 + } else {//其他医院规则
  3127 + //月份
  3128 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), checkModel.getCheckDate());
  3129 +
  3130 + if (monthNum < 3) {
  3131 + model.setTcType(ChildCareEnums.JCTCEnums.A.getId());
  3132 + } else if (monthNum < 6) {
  3133 + model.setTcType(ChildCareEnums.JCTCEnums.B.getId());
  3134 + } else if (monthNum < 8) {
  3135 + model.setTcType(ChildCareEnums.JCTCEnums.C.getId());
  3136 + } else if (monthNum < 12) {
  3137 + model.setTcType(ChildCareEnums.JCTCEnums.D.getId());
  3138 + } else if (monthNum < 18) {
  3139 + model.setTcType(ChildCareEnums.JCTCEnums.E.getId());
  3140 + } else if (monthNum < 24) {
  3141 + model.setTcType(ChildCareEnums.JCTCEnums.F.getId());
  3142 + } else if (monthNum < 30) {
  3143 + model.setTcType(ChildCareEnums.JCTCEnums.G.getId());
  3144 + } else if (monthNum < 36) {
  3145 + model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
  3146 + }
  3147 + }
  3148 + String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
  3149 + if (StringUtils.isNotEmpty(checkMonthAge)) {
  3150 + if (checkMonthAge.indexOf("岁") != -1) {
  3151 + String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁"));
  3152 + int year = Integer.parseInt(yearStr);
  3153 + if (year == 3) {
  3154 + model.setTcType(ChildCareEnums.JCTCEnums.I.getId());
  3155 + } else if (year == 4) {
  3156 + model.setTcType(ChildCareEnums.JCTCEnums.J.getId());
  3157 + } else if (year == 5) {
  3158 + model.setTcType(ChildCareEnums.JCTCEnums.K.getId());
  3159 + } else if (year == 6) {
  3160 + model.setTcType(ChildCareEnums.JCTCEnums.L.getId());
  3161 + }
  3162 + }
  3163 + }
  3164 + }
  3165 +
  3166 +
3102 3167 model.setBabyName(babyModel.getName());
3103 3168 model.setBabyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
3104 3169 model.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
3105 3170  
3106 3171  
... ... @@ -3171,11 +3236,10 @@
3171 3236 model.setTcType(checkModel.getTcType());
3172 3237  
3173 3238  
3174   -
3175 3239 model.setCnqk(checkModel.getCnqk());
3176   - model.setMtcnNum( UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI));
  3240 + model.setMtcnNum(UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI));
3177 3241 model.setXbNum(UnitUtils.unitSplice(checkModel.getXbNum(), UnitConstants.CI));
3178   - model.setDbNum( UnitUtils.unitSplice(checkModel.getDbNum(), UnitConstants.CI));
  3242 + model.setDbNum(UnitUtils.unitSplice(checkModel.getDbNum(), UnitConstants.CI));
3179 3243 model.setQdtlTime(checkModel.getQdtlTime());
3180 3244 model.setPfhrTime(checkModel.getPfhrTime());
3181 3245 model.setWssAd(checkModel.getWssAd());
... ... @@ -3191,7 +3255,6 @@
3191 3255 model.setNd(UnitUtils.unitSplice(checkModel.getNd(), UnitConstants.GG));
3192 3256  
3193 3257  
3194   -
3195 3258 model.setYgbmky(FunvCommonUtil.checkYiGan(checkModel.getYgbmky()));
3196 3259 model.setYgeky(FunvCommonUtil.checkYiGan(checkModel.getYgeky()));
3197 3260 model.setYgekt(FunvCommonUtil.checkYiGan(checkModel.getYgekt()));
3198 3261  
... ... @@ -3212,9 +3275,9 @@
3212 3275 model.setYghxktNum(checkModel.getYghxktNum());
3213 3276  
3214 3277 model.setXqgbzam(UnitUtils.unitSplice(checkModel.getXqgbzam(), UnitConstants.UL));
3215   - model.setXqgczam( UnitUtils.unitSplice(checkModel.getXqgczam(), UnitConstants.UL));
  3278 + model.setXqgczam(UnitUtils.unitSplice(checkModel.getXqgczam(), UnitConstants.UL));
3216 3279 model.setAlbumin(UnitUtils.unitSplice(checkModel.getAlbumin(), UnitConstants.UL));
3217   - model.setTotalBilirubin( UnitUtils.unitSplice(checkModel.getTotalBilirubin(), UnitConstants.UL));
  3280 + model.setTotalBilirubin(UnitUtils.unitSplice(checkModel.getTotalBilirubin(), UnitConstants.UL));
3218 3281 model.setJhBilirubin(UnitUtils.unitSplice(checkModel.getJhBilirubin(), UnitConstants.UL));
3219 3282  
3220 3283 model.setBcgYs(checkModel.getBcgYs());
3221 3284  
... ... @@ -3291,8 +3354,10 @@
3291 3354 model.setWeight(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getWeight(), UnitConstants.KG));
3292 3355 model.setHead(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHead(), UnitConstants.CM));
3293 3356 model.setHeightWeight(checkModel.getHeightWeight());
3294   - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate())) {
  3357 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()))
3295 3358  
  3359 + {
  3360 +
3296 3361 List<String> list = JsonUtil.toList(checkModel.getGrowthEvaluate(), String.class);
3297 3362 if (CollectionUtils.isNotEmpty(list)) {
3298 3363 StringBuffer sb = new StringBuffer();
3299 3364  
3300 3365  
... ... @@ -3310,15 +3375,21 @@
3310 3375  
3311 3376  
3312 3377 String bilirubin = "";
3313   - if (StringUtils.isNotEmpty(checkModel.getBilirubinHead())) {
  3378 + if (StringUtils.isNotEmpty(checkModel.getBilirubinHead()))
  3379 +
  3380 + {
3314 3381 bilirubin += " 头" + checkModel.getBilirubinHead() + " mg/dl";
3315 3382 }
3316 3383  
3317   - if (StringUtils.isNotEmpty(checkModel.getBilirubinChest())) {
  3384 + if (StringUtils.isNotEmpty(checkModel.getBilirubinChest()))
  3385 +
  3386 + {
3318 3387 bilirubin += " 胸" + checkModel.getBilirubinChest() + " mg/dl";
3319 3388 }
3320 3389  
3321   - if (StringUtils.isNotEmpty(checkModel.getBilirubinBelly())) {
  3390 + if (StringUtils.isNotEmpty(checkModel.getBilirubinBelly()))
  3391 +
  3392 + {
3322 3393 bilirubin += " 腹" + checkModel.getBilirubinBelly() + " mg/dl";
3323 3394 }
3324 3395  
... ... @@ -3326,7 +3397,9 @@
3326 3397  
3327 3398 String bregma = "";
3328 3399 String bregmaValue = "";
3329   - if (StringUtils.isNotEmpty(checkModel.getBregma())) {
  3400 + if (StringUtils.isNotEmpty(checkModel.getBregma()))
  3401 +
  3402 + {
3330 3403 Map map = JsonUtil.str2Obj(checkModel.getBregma(), Map.class);
3331 3404 String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString();
3332 3405 if ("yes".equals(yesOrNo)) {
... ... @@ -3371,7 +3444,9 @@
3371 3444 model.setOtherUrine(checkModel.getOtherUrine());
3372 3445 String diagnoseStr = checkModel.getDiagnose();
3373 3446 String diagnoseValue = "";
3374   - if (!com.lyms.platform.common.utils.StringUtils.isEmpty(diagnoseStr)) {
  3447 + if (!com.lyms.platform.common.utils.StringUtils.isEmpty(diagnoseStr))
  3448 +
  3449 + {
3375 3450 List diagnoses = JsonUtil.toList(diagnoseStr, List.class);
3376 3451 for (int i = 0; i < diagnoses.size(); i++) {
3377 3452 if (diagnoses.get(i) != null) {
3378 3453  
... ... @@ -3395,8 +3470,10 @@
3395 3470 model.setHandlSuggest(checkModel.getHandlSuggest());
3396 3471 model.setGuideSuggest(checkModel.getGuideSuggest());
3397 3472  
3398   - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getCheckDoctor())) {
  3473 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getCheckDoctor()))
3399 3474  
  3475 + {
  3476 +
3400 3477 if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(checkModel.getCheckDoctor())) {
3401 3478 model.setCheckDoctor("产科病房");
3402 3479 } else {
... ... @@ -3409,7 +3486,9 @@
3409 3486  
3410 3487 }
3411 3488  
3412   - if (StringUtils.isNotEmpty(checkModel.getHospitalId())) {
  3489 + if (StringUtils.isNotEmpty(checkModel.getHospitalId()))
  3490 +
  3491 + {
3413 3492 Organization organization = organizationService.getOrganization(Integer.parseInt(checkModel.getHospitalId()));
3414 3493 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
3415 3494 model.setCheckHospital(organization.getName());
... ... @@ -3422,7 +3501,9 @@
3422 3501  
3423 3502  
3424 3503 String drugGllergic = "";
3425   - if (StringUtils.isNotEmpty(checkModel.getDrugGllergic())) {
  3504 + if (StringUtils.isNotEmpty(checkModel.getDrugGllergic()))
  3505 +
  3506 + {
3426 3507 Map map = JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class);
3427 3508 String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString();
3428 3509 if ("no".equals(yesOrNo)) {
... ... @@ -3445,7 +3526,7 @@
3445 3526 String qt = map.get("qt") == null ? "" : map.get("qt").toString();
3446 3527 if ("true".equals(qt)) {
3447 3528 String qtText = map.get("qtText") == null ? "" : map.get("qtText").toString();
3448   - drugGllergic += " " + qtText+",";
  3529 + drugGllergic += " " + qtText + ",";
3449 3530 }
3450 3531 drugGllergic = FunvCommonUtil.spitd(drugGllergic);
3451 3532 }
... ... @@ -4130,7 +4211,7 @@
4130 4211 map.put("husbandCardNo", data.getHcertificateNum());
4131 4212 map.put("husbandPhone", data.getHusbandPhone());
4132 4213  
4133   - map.put("hworkUnit",data.getHworkUnit());
  4214 + map.put("hworkUnit", data.getHworkUnit());
4134 4215  
4135 4216 br.setData(map);
4136 4217 br.setErrorcode(ErrorCodeConstants.SUCCESS);