jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1f011f4cff205fb4ae949d762e5008b240af8a7c

Authored by yangfei
1 parent 5b2d8a0015
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

处理儿保月龄套餐默认值，针对老数据处理

Showing 11 changed files with 239 additions and 127 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java View file @ 1f011f4
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.beans.SerialIdEnum;
  4 +import com.lyms.platform.common.enums.ChildCareEnums;
4 5 import com.lyms.platform.common.result.BaseModel;
  6 +import com.lyms.platform.common.utils.DateUtil;
  7 +import org.apache.commons.lang.StringUtils;
5 8 import org.springframework.data.mongodb.core.mapping.Document;
6 9  
7 10 import java.util.Date;
... ... @@ -1537,5 +1540,76 @@
1537 1540 public void setBuildId(String buildId) {
1538 1541 this.buildId = buildId;
1539 1542 }
  1543 +
  1544 + public void distOldTcType(BabyModel babyModel){
  1545 + if (tcType == null) {//历史数据不存在套餐处理成一个规则
  1546 + if ("216".equals(getHospitalId())) {//秦皇岛医院处理规则
  1547 + //月份
  1548 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), getCheckDate());
  1549 + //天数
  1550 + int day = DateUtil.getExcludeMonthDay(babyModel.getBirth(), getCheckDate());
  1551 +
  1552 + if (monthNum < 2 || (monthNum == 2 && day <= 10)) {
  1553 + setTcType(ChildCareEnums.JCTCEnums.A.getId());
  1554 + } else if (monthNum < 4 || (monthNum == 4 && day <= 20)) {
  1555 + setTcType(ChildCareEnums.JCTCEnums.B.getId());
  1556 + } else if (monthNum < 7 || (monthNum == 7 && day <= 20)) {
  1557 + setTcType(ChildCareEnums.JCTCEnums.C.getId());
  1558 + } else if (monthNum < 10 || (monthNum == 10 && day <= 20)) {
  1559 + setTcType(ChildCareEnums.JCTCEnums.D.getId());
  1560 + } else if (monthNum < 16 || (monthNum == 16 && day <= 20)) {
  1561 + setTcType(ChildCareEnums.JCTCEnums.E.getId());
  1562 + } else if (monthNum < 21 || (monthNum == 21 && day <= 20)) {
  1563 + setTcType(ChildCareEnums.JCTCEnums.F.getId());
  1564 + } else if (monthNum < 27 || (monthNum == 27 && day <= 20)) {
  1565 + setTcType(ChildCareEnums.JCTCEnums.G.getId());
  1566 + } else if (monthNum < 33 || (monthNum == 33 && day <= 20)) {
  1567 + setTcType(ChildCareEnums.JCTCEnums.H.getId());
  1568 + }
  1569 + } else {//其他医院规则
  1570 + //月份
  1571 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), getCheckDate());
  1572 +
  1573 + if (monthNum < 3) {
  1574 + setTcType(ChildCareEnums.JCTCEnums.A.getId());
  1575 + } else if (monthNum < 6) {
  1576 + setTcType(ChildCareEnums.JCTCEnums.B.getId());
  1577 + } else if (monthNum < 8) {
  1578 + setTcType(ChildCareEnums.JCTCEnums.C.getId());
  1579 + } else if (monthNum < 12) {
  1580 + setTcType(ChildCareEnums.JCTCEnums.D.getId());
  1581 + } else if (monthNum < 18) {
  1582 + setTcType(ChildCareEnums.JCTCEnums.E.getId());
  1583 + } else if (monthNum < 24) {
  1584 + setTcType(ChildCareEnums.JCTCEnums.F.getId());
  1585 + } else if (monthNum < 30) {
  1586 + setTcType(ChildCareEnums.JCTCEnums.G.getId());
  1587 + } else if (monthNum < 36) {
  1588 + setTcType(ChildCareEnums.JCTCEnums.H.getId());
  1589 + }
  1590 + }
  1591 + if (getTcType() == null) {//如果月龄未完成赋值,进行岁套餐匹配
  1592 + String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), getCheckDate());
  1593 + if (StringUtils.isNotEmpty(checkMonthAge)) {
  1594 + if (checkMonthAge.indexOf("岁") != -1) {
  1595 + String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁"));
  1596 + int year = Integer.parseInt(yearStr);
  1597 + if (year == 3) {
  1598 + setTcType(ChildCareEnums.JCTCEnums.I.getId());
  1599 + } else if (year == 4) {
  1600 + setTcType(ChildCareEnums.JCTCEnums.J.getId());
  1601 + } else if (year == 5) {
  1602 + setTcType(ChildCareEnums.JCTCEnums.K.getId());
  1603 + } else if (year == 6) {
  1604 + setTcType(ChildCareEnums.JCTCEnums.L.getId());
  1605 + }
  1606 + }else{
  1607 + setTcType(ChildCareEnums.JCTCEnums.A.getId());
  1608 + }
  1609 + }
  1610 + }
  1611 + }
  1612 + }
  1613 +
1540 1614 }
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 1f011f4
... ... @@ -350,7 +350,7 @@
350 350 //病历号(住院号)
351 351 private String blNo;
352 352  
353   - //nbna评分
  353 + //nbna评分(神经测定)
354 354 private String nbnaNum;
355 355  
356 356 /***畸形详情****/
... ... @@ -429,7 +429,7 @@
429 429 //先天性心脏病
430 430 private boolean jxXtx;
431 431 //其他(写明病名并详细描述)
432   - private boolean jxOther;
  432 + private Map<String,Object> jxOther;
433 433  
434 434 public Baby(){
435 435  
436 436  
... ... @@ -766,11 +766,12 @@
766 766 this.jxXtx = jxXtx;
767 767 }
768 768  
769   - public boolean isJxOther() {
  769 +
  770 + public Map<String, Object> getJxOther() {
770 771 return jxOther;
771 772 }
772 773  
773   - public void setJxOther(boolean jxOther) {
  774 + public void setJxOther(Map<String, Object> jxOther) {
774 775 this.jxOther = jxOther;
775 776 }
776 777  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 1f011f4
... ... @@ -695,8 +695,9 @@
695 695 checkRecord.put("monthAge", monthAge);
696 696 checkRecord.put("buildId", cmodel.getBuildId());
697 697 checkRecord.put("type", "2");
698   -
699   - checkRecord.put("tcType", cmodel.getTcType()==null?"":cmodel.getTcType()+"");
  698 + //根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐）
  699 + cmodel.distOldTcType(models.get(0));
  700 + checkRecord.put("tcType", cmodel.getTcType().toString());
700 701 checkRecord.put("hospitalId", models.get(0).getHospitalId());
701 702 //查询建档医院
702 703 Organization org = organizationService.getOrganization(Integer.valueOf(models.get(0).getHospitalId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 1f011f4
... ... @@ -334,6 +334,19 @@
334 334 BeanUtils.copy(dischargeAbstractBabyModel, dischargeAbstractBabyQueryModel);
335 335 dischargeAbstractBabyQueryModel.setbCGAndHBVVaccinationDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate()));
336 336 dischargeAbstractBabyQueryModel.sethBIGInjectDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.gethBIGInjectDate()));
  337 + //新增字段
  338 + if(dischargeAbstractBabyModel.getbCGVaccinDate()!=null||dischargeAbstractBabyModel.getHbvVaccinDate()!=null||
  339 + org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getHbvInjectUserName())|| org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getbCGInjectUserName())){//如果修改过数据
  340 + dischargeAbstractBabyQueryModel.setbCGVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGVaccinDate()));
  341 + dischargeAbstractBabyQueryModel.setHbvVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getHbvVaccinDate()));
  342 + dischargeAbstractBabyQueryModel.setHbvInjectUserName(dischargeAbstractBabyModel.getHbvInjectUserName());
  343 + dischargeAbstractBabyQueryModel.setbCGInjectUserName(dischargeAbstractBabyModel.getbCGInjectUserName());
  344 + }else{//使用老数据兼容数据
  345 + dischargeAbstractBabyQueryModel.setbCGVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate()));
  346 + dischargeAbstractBabyQueryModel.setHbvVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate()));
  347 + dischargeAbstractBabyQueryModel.setHbvInjectUserName(dischargeAbstractBabyModel.getbCGAndHBVVaccinationInjectUserName());
  348 + dischargeAbstractBabyQueryModel.setbCGInjectUserName(dischargeAbstractBabyModel.getbCGAndHBVVaccinationInjectUserName());
  349 + }
337 350 dischargeAbstractBabyQueryModelList.add(dischargeAbstractBabyQueryModel);
338 351 }
339 352 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 1f011f4
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.operate.web.result.*;
15 15 import com.lyms.platform.operate.web.service.ITrackDownService;
16 16 import com.lyms.platform.operate.web.utils.CommonsHelper;
  17 +import com.lyms.platform.operate.web.utils.UnitConstants;
17 18 import com.lyms.platform.permission.model.Organization;
18 19 import com.lyms.platform.permission.model.OrganizationQuery;
19 20 import com.lyms.platform.permission.model.PatientService;
... ... @@ -2063,6 +2064,22 @@
2063 2064 newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
2064 2065 }
2065 2066 BeanUtils.copy(babyModel, newBabyManagerQueryModel);
  2067 +
  2068 + String apgarScorePf1 = "";
  2069 + String apgarScorePf5 = "";
  2070 + String apgarScorePf10 = "";
  2071 + Map<String, String> m = JsonUtil.getMap(babyModel.getApgarScore());
  2072 + if (MapUtils.isNotEmpty(m)) {
  2073 + apgarScorePf1 = m.get("pf1") == null ? "" : m.get("pf1");
  2074 + apgarScorePf5 = m.get("pf5") == null ? "" : m.get("pf5");
  2075 + apgarScorePf10 = m.get("pf10") == null ? "" : m.get("pf10");
  2076 + }
  2077 + String apgarScore = "";
  2078 +
  2079 + if (StringUtils.isNotEmpty(apgarScorePf1) && StringUtils.isNotEmpty(apgarScorePf5) && StringUtils.isNotEmpty(apgarScorePf10)) {
  2080 + apgarScore = apgarScorePf1 + UnitConstants.FEN + " - " + apgarScorePf5 + UnitConstants.FEN + " - " + apgarScorePf10 + UnitConstants.FEN;
  2081 + }
  2082 + newBabyManagerQueryModel.setApgarScore(apgarScore);
2066 2083 newBabyManagerQueryModel.setMcertNo(DefenceUtils.getCardNo(babyModel.getMcertNo()));
2067 2084 newBabyManagerQueryModel.setMcertNo2(babyModel.getMcertNo());
2068 2085 newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 1f011f4
... ... @@ -1993,7 +1993,7 @@
1993 1993 szy = chBpMap.get("szy");
1994 1994 }
1995 1995 map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
1996   - map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao());
  1996 + map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao());
1997 1997  
1998 1998 if (StringUtils.isNotEmpty(data.getGongGaoSelect())) {
1999 1999 map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()));
... ... @@ -2493,45 +2493,45 @@
2493 2493 if (CollectionUtils.isNotEmpty(data.getBaby())) {
2494 2494 for (MaternalDeliverModel.Baby temp : data.getBaby()) {
2495 2495 Map<String, Object> babyMap = new HashMap<>();
2496   - babyMap.put("nbnaNum",temp.getNbnaNum());
2497   - babyMap.put("jxWn",temp.isJxWn());
2498   - babyMap.put("jxJzl",temp.isJxJzl());
2499   - babyMap.put("jxNpc",temp.isJxNpc());
2500   - babyMap.put("jxnjs",temp.isJxNjs());
2501   - babyMap.put("jxEl",temp.isJxEl());
2502   - babyMap.put("jxelSele",temp.getJxelSele());
2503   - babyMap.put("jxCl",temp.isJxCl());
2504   - babyMap.put("jxClSele",temp.getJxClSele());
2505   - babyMap.put("jxClhb",temp.isJxClhb());
2506   - babyMap.put("jxClhbSele",temp.getJxClhbSele());
2507   - babyMap.put("jxXe",temp.isJxXe());
2508   - babyMap.put("jxXeSele",temp.getJxXeSele());
2509   - babyMap.put("jxWe",temp.isJxWe());
2510   - babyMap.put("jxWeSele",temp.getJxWeSele());
2511   - babyMap.put("jxSdbs",temp.isJxSdbs());
2512   - babyMap.put("jxZcgm",temp.isJxZcgm());
2513   - babyMap.put("jxNdxl",temp.isJxNdxl());
2514   - babyMap.put("jxPwwf",temp.isJxPwwf());
2515   - babyMap.put("jxMtn",temp.isJxMtn());
2516   - babyMap.put("jxMtnSele",temp.getJxMtnSele());
2517   - babyMap.put("jxDz",temp.isJxDz());
2518   - babyMap.put("jxDzSele",temp.getJxDzSele());
2519   - babyMap.put("jxDc",temp.isJxDc());
2520   - babyMap.put("jxDcSele",temp.getJxDcSele());
2521   - babyMap.put("jxBz",temp.isJxBz());
2522   - babyMap.put("jxBzSele",temp.getJxBzSele());
2523   - babyMap.put("jxBc",temp.isJxBc());
2524   - babyMap.put("jxBcSele",temp.getJxBcSele());
2525   - babyMap.put("jxZtds",temp.isJxZtds());
2526   - babyMap.put("jxZtdsTopSele",temp.getJxZtdsTopSele());
2527   - babyMap.put("jxZtdsBottomSele",temp.getJxZtdsBottomSele());
2528   - babyMap.put("jxXtxe",temp.isJxXtxe());
2529   - babyMap.put("jxQpc",temp.isJxQpc());
2530   - babyMap.put("jxFl",temp.isJxFl());
2531   - babyMap.put("jxLtst",temp.isJxLtst());
2532   - babyMap.put("jxTszh",temp.isJxTszh());
2533   - babyMap.put("jxXtx",temp.isJxXtx());
2534   - babyMap.put("jxOther",temp.isJxOther());
  2496 + babyMap.put("nbnaNum", UnitUtils.unitSplice(temp.getNbnaNum(), UnitConstants.FEN));
  2497 + babyMap.put("jxWn", temp.isJxWn());
  2498 + babyMap.put("jxJzl", temp.isJxJzl());
  2499 + babyMap.put("jxNpc", temp.isJxNpc());
  2500 + babyMap.put("jxnjs", temp.isJxNjs());
  2501 + babyMap.put("jxEl", temp.isJxEl());
  2502 + babyMap.put("jxelSele", temp.getJxelSele());
  2503 + babyMap.put("jxCl", temp.isJxCl());
  2504 + babyMap.put("jxClSele", temp.getJxClSele());
  2505 + babyMap.put("jxClhb", temp.isJxClhb());
  2506 + babyMap.put("jxClhbSele", temp.getJxClhbSele());
  2507 + babyMap.put("jxXe", temp.isJxXe());
  2508 + babyMap.put("jxXeSele", temp.getJxXeSele());
  2509 + babyMap.put("jxWe", temp.isJxWe());
  2510 + babyMap.put("jxWeSele", temp.getJxWeSele());
  2511 + babyMap.put("jxSdbs", temp.isJxSdbs());
  2512 + babyMap.put("jxZcgm", temp.isJxZcgm());
  2513 + babyMap.put("jxNdxl", temp.isJxNdxl());
  2514 + babyMap.put("jxPwwf", temp.isJxPwwf());
  2515 + babyMap.put("jxMtn", temp.isJxMtn());
  2516 + babyMap.put("jxMtnSele", temp.getJxMtnSele());
  2517 + babyMap.put("jxDz", temp.isJxDz());
  2518 + babyMap.put("jxDzSele", temp.getJxDzSele());
  2519 + babyMap.put("jxDc", temp.isJxDc());
  2520 + babyMap.put("jxDcSele", temp.getJxDcSele());
  2521 + babyMap.put("jxBz", temp.isJxBz());
  2522 + babyMap.put("jxBzSele", temp.getJxBzSele());
  2523 + babyMap.put("jxBc", temp.isJxBc());
  2524 + babyMap.put("jxBcSele", temp.getJxBcSele());
  2525 + babyMap.put("jxZtds", temp.isJxZtds());
  2526 + babyMap.put("jxZtdsTopSele", temp.getJxZtdsTopSele());
  2527 + babyMap.put("jxZtdsBottomSele", temp.getJxZtdsBottomSele());
  2528 + babyMap.put("jxXtxe", temp.isJxXtxe());
  2529 + babyMap.put("jxQpc", temp.isJxQpc());
  2530 + babyMap.put("jxFl", temp.isJxFl());
  2531 + babyMap.put("jxLtst", temp.isJxLtst());
  2532 + babyMap.put("jxTszh", temp.isJxTszh());
  2533 + babyMap.put("jxXtx", temp.isJxXtx());
  2534 + babyMap.put("jxOther", temp.getJxOther());
2535 2535  
2536 2536  
2537 2537 babyMap.put("babyId", temp.getId());
2538 2538  
... ... @@ -2934,13 +2934,13 @@
2934 2934 Map<String, Object> babyMap = new HashMap<>();
2935 2935  
2936 2936 //新增字段
2937   - if(temp.getbCGVaccinDate()!=null||temp.getHbvVaccinDate()!=null||
2938   - StringUtils.isNotEmpty(temp.getHbvInjectUserName())||StringUtils.isNotEmpty(temp.getbCGInjectUserName())){//如果修改过数据
2939   - babyMap.put("bCGVaccinDate", temp.getbCGVaccinDate());
2940   - babyMap.put("hbvVaccinDate", temp.getHbvVaccinDate());
  2937 + if (temp.getbCGVaccinDate() != null || temp.getHbvVaccinDate() != null ||
  2938 + StringUtils.isNotEmpty(temp.getHbvInjectUserName()) || StringUtils.isNotEmpty(temp.getbCGInjectUserName())) {//如果修改过数据
  2939 + babyMap.put("bCGVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGVaccinDate()));
  2940 + babyMap.put("hbvVaccinDate", DateUtil.getyyyy_MM_dd(temp.getHbvVaccinDate()));
2941 2941 babyMap.put("hbvInjectUserName", temp.getHbvInjectUserName());
2942 2942 babyMap.put("bCGInjectUserName", temp.getbCGInjectUserName());
2943   - }else{
  2943 + } else {//使用老数据兼容数据
2944 2944 babyMap.put("bCGVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate()));
2945 2945 babyMap.put("hbvVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate()));
2946 2946 babyMap.put("hbvInjectUserName", temp.getbCGAndHBVVaccinationInjectUserName());
2947 2947  
... ... @@ -3202,77 +3202,11 @@
3202 3202  
3203 3203 private BabyCheckPageResult getBabyCheckResult(BabyCheckModel checkModel, BabyModel babyModel) {
3204 3204 BabyCheckPageResult model = new BabyCheckPageResult();
3205   - //新加字段,检查套餐
3206   - model.setTcType(checkModel.getTcType());
3207 3205  
3208 3206 if (babyModel != null) {
3209   - if (checkModel.getTcType() == null) {//历史数据不存在套餐处理成一个规则
3210   - if ("216".equals(checkModel.getHospitalId())) {//秦皇岛医院处理规则
3211   - //月份
3212   - int monthNum = DateUtil.getMonth(babyModel.getBirth(), checkModel.getCheckDate());
3213   - //天数
3214   - int day = DateUtil.getExcludeMonthDay(babyModel.getBirth(), checkModel.getCheckDate());
3215   -
3216   - if (monthNum < 2 || (monthNum == 2 && day <= 10)) {
3217   - model.setTcType(ChildCareEnums.JCTCEnums.A.getId());
3218   - } else if (monthNum < 4 || (monthNum == 4 && day <= 20)) {
3219   - model.setTcType(ChildCareEnums.JCTCEnums.B.getId());
3220   - } else if (monthNum < 7 || (monthNum == 7 && day <= 20)) {
3221   - model.setTcType(ChildCareEnums.JCTCEnums.C.getId());
3222   - } else if (monthNum < 10 || (monthNum == 10 && day <= 20)) {
3223   - model.setTcType(ChildCareEnums.JCTCEnums.D.getId());
3224   - } else if (monthNum < 16 || (monthNum == 16 && day <= 20)) {
3225   - model.setTcType(ChildCareEnums.JCTCEnums.E.getId());
3226   - } else if (monthNum < 21 || (monthNum == 21 && day <= 20)) {
3227   - model.setTcType(ChildCareEnums.JCTCEnums.F.getId());
3228   - } else if (monthNum < 27 || (monthNum == 27 && day <= 20)) {
3229   - model.setTcType(ChildCareEnums.JCTCEnums.G.getId());
3230   - } else if (monthNum < 33 || (monthNum == 33 && day <= 20)) {
3231   - model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
3232   - }
3233   - } else {//其他医院规则
3234   - //月份
3235   - int monthNum = DateUtil.getMonth(babyModel.getBirth(), checkModel.getCheckDate());
3236   -
3237   - if (monthNum < 3) {
3238   - model.setTcType(ChildCareEnums.JCTCEnums.A.getId());
3239   - } else if (monthNum < 6) {
3240   - model.setTcType(ChildCareEnums.JCTCEnums.B.getId());
3241   - } else if (monthNum < 8) {
3242   - model.setTcType(ChildCareEnums.JCTCEnums.C.getId());
3243   - } else if (monthNum < 12) {
3244   - model.setTcType(ChildCareEnums.JCTCEnums.D.getId());
3245   - } else if (monthNum < 18) {
3246   - model.setTcType(ChildCareEnums.JCTCEnums.E.getId());
3247   - } else if (monthNum < 24) {
3248   - model.setTcType(ChildCareEnums.JCTCEnums.F.getId());
3249   - } else if (monthNum < 30) {
3250   - model.setTcType(ChildCareEnums.JCTCEnums.G.getId());
3251   - } else if (monthNum < 36) {
3252   - model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
3253   - }
3254   - }
3255   - if (model.getTcType() == null) {//如果月龄未完成赋值
3256   - String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
3257   - if (StringUtils.isNotEmpty(checkMonthAge)) {
3258   - if (checkMonthAge.indexOf("岁") != -1) {
3259   - String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁"));
3260   - int year = Integer.parseInt(yearStr);
3261   - if (year == 3) {
3262   - model.setTcType(ChildCareEnums.JCTCEnums.I.getId());
3263   - } else if (year == 4) {
3264   - model.setTcType(ChildCareEnums.JCTCEnums.J.getId());
3265   - } else if (year == 5) {
3266   - model.setTcType(ChildCareEnums.JCTCEnums.K.getId());
3267   - } else if (year == 6) {
3268   - model.setTcType(ChildCareEnums.JCTCEnums.L.getId());
3269   - }
3270   - }
3271   - }
3272   - }
3273   - }
3274   -
3275   -
  3207 + //根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐）
  3208 + checkModel.distOldTcType(babyModel);
  3209 + model.setTcType(checkModel.getTcType());
3276 3210 model.setBabyName(babyModel.getName());
3277 3211 model.setBabyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
3278 3212 model.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 1f011f4
... ... @@ -440,6 +440,9 @@
440 440 initQueryMap.put("patientId", "");
441 441 initQueryMap.put("pid", "");
442 442 Map<String, String> normalQueryMap = new LinkedHashMap<>();
  443 + normalQueryMap.put("apgarScorePf1", "Apgar1分钟");
  444 + normalQueryMap.put("apgarScorePf5", "Apgar5分钟");
  445 + normalQueryMap.put("apgarScorePf10", "Apgar10分钟");
443 446 normalQueryMap.put("dueDate", "分娩日期");
444 447 normalQueryMap.put("name", "姓名");
445 448 normalQueryMap.put("age", "年龄");
... ... @@ -455,6 +458,9 @@
455 458 normalQueryMap.put("patientId", "");
456 459 normalQueryMap.put("pid", "");
457 460 Map<String, String> areaQueryMap = new LinkedHashMap<>();
  461 + areaQueryMap.put("apgarScorePf1", "Apgar1分钟");
  462 + areaQueryMap.put("apgarScorePf5", "Apgar5分钟");
  463 + areaQueryMap.put("apgarScorePf10", "Apgar10分钟");
458 464 areaQueryMap.put("dueDate", "分娩日期");
459 465 areaQueryMap.put("name", "姓名");
460 466 areaQueryMap.put("age", "年龄");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 1f011f4
... ... @@ -703,7 +703,7 @@
703 703 //先天性心脏病
704 704 private boolean jxXtx;
705 705 //其他(写明病名并详细描述)
706   - private boolean jxOther;
  706 + private Map jxOther;
707 707 /***畸形详情结束****/
708 708  
709 709 @Override
710 710  
... ... @@ -1073,11 +1073,11 @@
1073 1073 this.jxXtx = jxXtx;
1074 1074 }
1075 1075  
1076   - public boolean isJxOther() {
  1076 + public Map getJxOther() {
1077 1077 return jxOther;
1078 1078 }
1079 1079  
1080   - public void setJxOther(boolean jxOther) {
  1080 + public void setJxOther(Map jxOther) {
1081 1081 this.jxOther = jxOther;
1082 1082 }
1083 1083  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java View file @ 1f011f4
... ... @@ -63,7 +63,28 @@
63 63 */
64 64 private String bCGAndHBVVaccinationInjectUserName;
65 65  
  66 + /** 2018年3月21日要求进行分离
  67 + * 卡介苗接种日期
  68 + */
  69 + private String bCGVaccinDate;
66 70 /**
  71 + * 2018年3月21日要求进行分离
  72 + * 乙肝疫苗接种日期
  73 + */
  74 + private String hbvVaccinDate;
  75 + /**
  76 + * 2018年3月21日要求进行分离
  77 + * 乙肝疫苗注射者
  78 + */
  79 + private String hbvInjectUserName;
  80 +
  81 + /**
  82 + * 2018年3月21日要求进行分离
  83 + * 卡介苗接种注射者
  84 + */
  85 + private String bCGInjectUserName;
  86 +
  87 + /**
67 88 * @auther HuJiaqi
68 89 * @createTime 2016年12月05日 18时19分
69 90 * @discription 是否注射乙肝免疫球蛋白
... ... @@ -125,6 +146,38 @@
125 146 * @discription 其他筛查具体信息
126 147 */
127 148 private String orderScreenDescription;
  149 +
  150 + public String getbCGVaccinDate() {
  151 + return bCGVaccinDate;
  152 + }
  153 +
  154 + public void setbCGVaccinDate(String bCGVaccinDate) {
  155 + this.bCGVaccinDate = bCGVaccinDate;
  156 + }
  157 +
  158 + public String getHbvVaccinDate() {
  159 + return hbvVaccinDate;
  160 + }
  161 +
  162 + public void setHbvVaccinDate(String hbvVaccinDate) {
  163 + this.hbvVaccinDate = hbvVaccinDate;
  164 + }
  165 +
  166 + public String getHbvInjectUserName() {
  167 + return hbvInjectUserName;
  168 + }
  169 +
  170 + public void setHbvInjectUserName(String hbvInjectUserName) {
  171 + this.hbvInjectUserName = hbvInjectUserName;
  172 + }
  173 +
  174 + public String getbCGInjectUserName() {
  175 + return bCGInjectUserName;
  176 + }
  177 +
  178 + public void setbCGInjectUserName(String bCGInjectUserName) {
  179 + this.bCGInjectUserName = bCGInjectUserName;
  180 + }
128 181  
129 182 public String getId() {
130 183 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ 1f011f4
... ... @@ -286,7 +286,7 @@
286 286 //先天性心脏病
287 287 private boolean jxXtx;
288 288 //其他(写明病名并详细描述)
289   - private boolean jxOther;
  289 + private Map jxOther;
290 290  
291 291 public Baby(MaternalDeliverModel.Baby babyModel){
292 292 setId(babyModel.getId());
... ... @@ -341,7 +341,7 @@
341 341 setJxLtst(babyModel.isJxLtst());
342 342 setJxTszh(babyModel.isJxTszh());
343 343 setJxXtx(babyModel.isJxXtx());
344   - setJxOther(babyModel.isJxOther());
  344 + setJxOther(babyModel.getJxOther());
345 345 }
346 346  
347 347 public String getNbnaNum() {
348 348  
... ... @@ -648,11 +648,11 @@
648 648 this.jxXtx = jxXtx;
649 649 }
650 650  
651   - public boolean isJxOther() {
  651 + public Map getJxOther() {
652 652 return jxOther;
653 653 }
654 654  
655   - public void setJxOther(boolean jxOther) {
  655 + public void setJxOther(Map jxOther) {
656 656 this.jxOther = jxOther;
657 657 }
658 658  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ 1f011f4
... ... @@ -106,6 +106,11 @@
106 106 */
107 107 private String mcertNo;
108 108  
  109 + /**
  110 + * @discription 儿童评分
  111 + */
  112 + private String apgarScore;
  113 +
109 114 private String mcertNo2;
110 115  
111 116 public String getMcertNo2() {
... ... @@ -129,6 +134,14 @@
129 134 * @discription 接生医生
130 135 */
131 136 private String deliverDoctor;
  137 +
  138 + public String getApgarScore() {
  139 + return apgarScore;
  140 + }
  141 +
  142 + public void setApgarScore(String apgarScore) {
  143 + this.apgarScore = apgarScore;
  144 + }
132 145  
133 146 public String getMaternalDeliverId() {
134 147 return maternalDeliverId;