From 1f011f4cff205fb4ae949d762e5008b240af8a7c Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 26 Mar 2018 15:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=84=BF=E4=BF=9D=E6=9C=88?= =?UTF-8?q?=E9=BE=84=E5=A5=97=E9=A4=90=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E9=92=88=E5=AF=B9=E8=80=81=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/BabyCheckModel.java | 74 ++++++++++ .../lyms/platform/pojo/MaternalDeliverModel.java | 9 +- .../operate/web/facade/BabyCheckFacade.java | 5 +- .../web/facade/DischargeAbstractFacade.java | 13 ++ .../operate/web/facade/MatDeliverFacade.java | 17 +++ .../platform/operate/web/facade/ViewFacade.java | 162 ++++++--------------- .../web/request/ChildbirthManagerRequest.java | 6 + .../operate/web/request/MatDeliverAddRequest.java | 6 +- .../result/DischargeAbstractBabyQueryModel.java | 53 +++++++ .../operate/web/result/MaternalDeliverResult.java | 8 +- .../web/result/NewBabyManagerQueryModel.java | 13 ++ 11 files changed, 239 insertions(+), 127 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 2adc507..296dd11 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -1,7 +1,10 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.enums.ChildCareEnums; import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; +import org.apache.commons.lang.StringUtils; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -1537,4 +1540,75 @@ public class BabyCheckModel extends BaseModel { public void setBuildId(String buildId) { this.buildId = buildId; } + + public void distOldTcType(BabyModel babyModel){ + if (tcType == null) {//历史数据不存在套餐处理成一个规则 + if ("216".equals(getHospitalId())) {//秦皇岛医院处理规则 + //月份 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), getCheckDate()); + //天数 + int day = DateUtil.getExcludeMonthDay(babyModel.getBirth(), getCheckDate()); + + if (monthNum < 2 || (monthNum == 2 && day <= 10)) { + setTcType(ChildCareEnums.JCTCEnums.A.getId()); + } else if (monthNum < 4 || (monthNum == 4 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.B.getId()); + } else if (monthNum < 7 || (monthNum == 7 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.C.getId()); + } else if (monthNum < 10 || (monthNum == 10 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.D.getId()); + } else if (monthNum < 16 || (monthNum == 16 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.E.getId()); + } else if (monthNum < 21 || (monthNum == 21 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.F.getId()); + } else if (monthNum < 27 || (monthNum == 27 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.G.getId()); + } else if (monthNum < 33 || (monthNum == 33 && day <= 20)) { + setTcType(ChildCareEnums.JCTCEnums.H.getId()); + } + } else {//其他医院规则 + //月份 + int monthNum = DateUtil.getMonth(babyModel.getBirth(), getCheckDate()); + + if (monthNum < 3) { + setTcType(ChildCareEnums.JCTCEnums.A.getId()); + } else if (monthNum < 6) { + setTcType(ChildCareEnums.JCTCEnums.B.getId()); + } else if (monthNum < 8) { + setTcType(ChildCareEnums.JCTCEnums.C.getId()); + } else if (monthNum < 12) { + setTcType(ChildCareEnums.JCTCEnums.D.getId()); + } else if (monthNum < 18) { + setTcType(ChildCareEnums.JCTCEnums.E.getId()); + } else if (monthNum < 24) { + setTcType(ChildCareEnums.JCTCEnums.F.getId()); + } else if (monthNum < 30) { + setTcType(ChildCareEnums.JCTCEnums.G.getId()); + } else if (monthNum < 36) { + setTcType(ChildCareEnums.JCTCEnums.H.getId()); + } + } + if (getTcType() == null) {//如果月龄未完成赋值,进行岁套餐匹配 + String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), getCheckDate()); + if (StringUtils.isNotEmpty(checkMonthAge)) { + if (checkMonthAge.indexOf("岁") != -1) { + String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁")); + int year = Integer.parseInt(yearStr); + if (year == 3) { + setTcType(ChildCareEnums.JCTCEnums.I.getId()); + } else if (year == 4) { + setTcType(ChildCareEnums.JCTCEnums.J.getId()); + } else if (year == 5) { + setTcType(ChildCareEnums.JCTCEnums.K.getId()); + } else if (year == 6) { + setTcType(ChildCareEnums.JCTCEnums.L.getId()); + } + }else{ + setTcType(ChildCareEnums.JCTCEnums.A.getId()); + } + } + } + } + } + } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 6c851f1..28fff67 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -350,7 +350,7 @@ public class MaternalDeliverModel extends BaseModel { //病历号(住院号) private String blNo; - //nbna评分 + //nbna评分(神经测定) private String nbnaNum; /***畸形详情****/ @@ -429,7 +429,7 @@ public class MaternalDeliverModel extends BaseModel { //先天性心脏病 private boolean jxXtx; //其他(写明病名并详细描述) - private boolean jxOther; + private Map jxOther; public Baby(){ @@ -766,11 +766,12 @@ public class MaternalDeliverModel extends BaseModel { this.jxXtx = jxXtx; } - public boolean isJxOther() { + + public Map getJxOther() { return jxOther; } - public void setJxOther(boolean jxOther) { + public void setJxOther(Map jxOther) { this.jxOther = jxOther; } 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 6734111..0608a1f 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 @@ -695,8 +695,9 @@ public class BabyCheckFacade { checkRecord.put("monthAge", monthAge); checkRecord.put("buildId", cmodel.getBuildId()); checkRecord.put("type", "2"); - - checkRecord.put("tcType", cmodel.getTcType()==null?"":cmodel.getTcType()+""); + //根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐） + cmodel.distOldTcType(models.get(0)); + checkRecord.put("tcType", cmodel.getTcType().toString()); 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/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index f767c79..f565243 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -334,6 +334,19 @@ public class DischargeAbstractFacade { BeanUtils.copy(dischargeAbstractBabyModel, dischargeAbstractBabyQueryModel); dischargeAbstractBabyQueryModel.setbCGAndHBVVaccinationDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate())); dischargeAbstractBabyQueryModel.sethBIGInjectDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.gethBIGInjectDate())); + //新增字段 + if(dischargeAbstractBabyModel.getbCGVaccinDate()!=null||dischargeAbstractBabyModel.getHbvVaccinDate()!=null|| + org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getHbvInjectUserName())|| org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getbCGInjectUserName())){//如果修改过数据 + dischargeAbstractBabyQueryModel.setbCGVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGVaccinDate())); + dischargeAbstractBabyQueryModel.setHbvVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getHbvVaccinDate())); + dischargeAbstractBabyQueryModel.setHbvInjectUserName(dischargeAbstractBabyModel.getHbvInjectUserName()); + dischargeAbstractBabyQueryModel.setbCGInjectUserName(dischargeAbstractBabyModel.getbCGInjectUserName()); + }else{//使用老数据兼容数据 + dischargeAbstractBabyQueryModel.setbCGVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate())); + dischargeAbstractBabyQueryModel.setHbvVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate())); + dischargeAbstractBabyQueryModel.setHbvInjectUserName(dischargeAbstractBabyModel.getbCGAndHBVVaccinationInjectUserName()); + dischargeAbstractBabyQueryModel.setbCGInjectUserName(dischargeAbstractBabyModel.getbCGAndHBVVaccinationInjectUserName()); + } dischargeAbstractBabyQueryModelList.add(dischargeAbstractBabyQueryModel); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 83f8172..368a327 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.PatientService; @@ -2063,6 +2064,22 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); } BeanUtils.copy(babyModel, newBabyManagerQueryModel); + + String apgarScorePf1 = ""; + String apgarScorePf5 = ""; + String apgarScorePf10 = ""; + Map m = JsonUtil.getMap(babyModel.getApgarScore()); + if (MapUtils.isNotEmpty(m)) { + apgarScorePf1 = m.get("pf1") == null ? "" : m.get("pf1"); + apgarScorePf5 = m.get("pf5") == null ? "" : m.get("pf5"); + apgarScorePf10 = m.get("pf10") == null ? "" : m.get("pf10"); + } + String apgarScore = ""; + + if (StringUtils.isNotEmpty(apgarScorePf1) && StringUtils.isNotEmpty(apgarScorePf5) && StringUtils.isNotEmpty(apgarScorePf10)) { + apgarScore = apgarScorePf1 + UnitConstants.FEN + " - " + apgarScorePf5 + UnitConstants.FEN + " - " + apgarScorePf10 + UnitConstants.FEN; + } + newBabyManagerQueryModel.setApgarScore(apgarScore); newBabyManagerQueryModel.setMcertNo(DefenceUtils.getCardNo(babyModel.getMcertNo())); newBabyManagerQueryModel.setMcertNo2(babyModel.getMcertNo()); newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth())); 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 e65bf7e..53deec1 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 @@ -1993,7 +1993,7 @@ public class ViewFacade { szy = chBpMap.get("szy"); } map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); - map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao()); + map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao()); if (StringUtils.isNotEmpty(data.getGongGaoSelect())) { map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect())); @@ -2493,45 +2493,45 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(data.getBaby())) { for (MaternalDeliverModel.Baby temp : data.getBaby()) { Map babyMap = new HashMap<>(); - babyMap.put("nbnaNum",temp.getNbnaNum()); - babyMap.put("jxWn",temp.isJxWn()); - babyMap.put("jxJzl",temp.isJxJzl()); - babyMap.put("jxNpc",temp.isJxNpc()); - babyMap.put("jxnjs",temp.isJxNjs()); - babyMap.put("jxEl",temp.isJxEl()); - babyMap.put("jxelSele",temp.getJxelSele()); - babyMap.put("jxCl",temp.isJxCl()); - babyMap.put("jxClSele",temp.getJxClSele()); - babyMap.put("jxClhb",temp.isJxClhb()); - babyMap.put("jxClhbSele",temp.getJxClhbSele()); - babyMap.put("jxXe",temp.isJxXe()); - babyMap.put("jxXeSele",temp.getJxXeSele()); - babyMap.put("jxWe",temp.isJxWe()); - babyMap.put("jxWeSele",temp.getJxWeSele()); - babyMap.put("jxSdbs",temp.isJxSdbs()); - babyMap.put("jxZcgm",temp.isJxZcgm()); - babyMap.put("jxNdxl",temp.isJxNdxl()); - babyMap.put("jxPwwf",temp.isJxPwwf()); - babyMap.put("jxMtn",temp.isJxMtn()); - babyMap.put("jxMtnSele",temp.getJxMtnSele()); - babyMap.put("jxDz",temp.isJxDz()); - babyMap.put("jxDzSele",temp.getJxDzSele()); - babyMap.put("jxDc",temp.isJxDc()); - babyMap.put("jxDcSele",temp.getJxDcSele()); - babyMap.put("jxBz",temp.isJxBz()); - babyMap.put("jxBzSele",temp.getJxBzSele()); - babyMap.put("jxBc",temp.isJxBc()); - babyMap.put("jxBcSele",temp.getJxBcSele()); - babyMap.put("jxZtds",temp.isJxZtds()); - babyMap.put("jxZtdsTopSele",temp.getJxZtdsTopSele()); - babyMap.put("jxZtdsBottomSele",temp.getJxZtdsBottomSele()); - babyMap.put("jxXtxe",temp.isJxXtxe()); - babyMap.put("jxQpc",temp.isJxQpc()); - babyMap.put("jxFl",temp.isJxFl()); - babyMap.put("jxLtst",temp.isJxLtst()); - babyMap.put("jxTszh",temp.isJxTszh()); - babyMap.put("jxXtx",temp.isJxXtx()); - babyMap.put("jxOther",temp.isJxOther()); + babyMap.put("nbnaNum", UnitUtils.unitSplice(temp.getNbnaNum(), UnitConstants.FEN)); + babyMap.put("jxWn", temp.isJxWn()); + babyMap.put("jxJzl", temp.isJxJzl()); + babyMap.put("jxNpc", temp.isJxNpc()); + babyMap.put("jxnjs", temp.isJxNjs()); + babyMap.put("jxEl", temp.isJxEl()); + babyMap.put("jxelSele", temp.getJxelSele()); + babyMap.put("jxCl", temp.isJxCl()); + babyMap.put("jxClSele", temp.getJxClSele()); + babyMap.put("jxClhb", temp.isJxClhb()); + babyMap.put("jxClhbSele", temp.getJxClhbSele()); + babyMap.put("jxXe", temp.isJxXe()); + babyMap.put("jxXeSele", temp.getJxXeSele()); + babyMap.put("jxWe", temp.isJxWe()); + babyMap.put("jxWeSele", temp.getJxWeSele()); + babyMap.put("jxSdbs", temp.isJxSdbs()); + babyMap.put("jxZcgm", temp.isJxZcgm()); + babyMap.put("jxNdxl", temp.isJxNdxl()); + babyMap.put("jxPwwf", temp.isJxPwwf()); + babyMap.put("jxMtn", temp.isJxMtn()); + babyMap.put("jxMtnSele", temp.getJxMtnSele()); + babyMap.put("jxDz", temp.isJxDz()); + babyMap.put("jxDzSele", temp.getJxDzSele()); + babyMap.put("jxDc", temp.isJxDc()); + babyMap.put("jxDcSele", temp.getJxDcSele()); + babyMap.put("jxBz", temp.isJxBz()); + babyMap.put("jxBzSele", temp.getJxBzSele()); + babyMap.put("jxBc", temp.isJxBc()); + babyMap.put("jxBcSele", temp.getJxBcSele()); + babyMap.put("jxZtds", temp.isJxZtds()); + babyMap.put("jxZtdsTopSele", temp.getJxZtdsTopSele()); + babyMap.put("jxZtdsBottomSele", temp.getJxZtdsBottomSele()); + babyMap.put("jxXtxe", temp.isJxXtxe()); + babyMap.put("jxQpc", temp.isJxQpc()); + babyMap.put("jxFl", temp.isJxFl()); + babyMap.put("jxLtst", temp.isJxLtst()); + babyMap.put("jxTszh", temp.isJxTszh()); + babyMap.put("jxXtx", temp.isJxXtx()); + babyMap.put("jxOther", temp.getJxOther()); babyMap.put("babyId", temp.getId()); @@ -2934,13 +2934,13 @@ public class ViewFacade { Map babyMap = new HashMap<>(); //新增字段 - if(temp.getbCGVaccinDate()!=null||temp.getHbvVaccinDate()!=null|| - StringUtils.isNotEmpty(temp.getHbvInjectUserName())||StringUtils.isNotEmpty(temp.getbCGInjectUserName())){//如果修改过数据 - babyMap.put("bCGVaccinDate", temp.getbCGVaccinDate()); - babyMap.put("hbvVaccinDate", temp.getHbvVaccinDate()); + if (temp.getbCGVaccinDate() != null || temp.getHbvVaccinDate() != null || + StringUtils.isNotEmpty(temp.getHbvInjectUserName()) || StringUtils.isNotEmpty(temp.getbCGInjectUserName())) {//如果修改过数据 + babyMap.put("bCGVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGVaccinDate())); + babyMap.put("hbvVaccinDate", DateUtil.getyyyy_MM_dd(temp.getHbvVaccinDate())); babyMap.put("hbvInjectUserName", temp.getHbvInjectUserName()); babyMap.put("bCGInjectUserName", temp.getbCGInjectUserName()); - }else{ + } else {//使用老数据兼容数据 babyMap.put("bCGVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate())); babyMap.put("hbvVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate())); babyMap.put("hbvInjectUserName", temp.getbCGAndHBVVaccinationInjectUserName()); @@ -3202,77 +3202,11 @@ public class ViewFacade { private BabyCheckPageResult getBabyCheckResult(BabyCheckModel checkModel, BabyModel babyModel) { BabyCheckPageResult model = new BabyCheckPageResult(); - //新加字段,检查套餐 - model.setTcType(checkModel.getTcType()); 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()); - } - } - if (model.getTcType() == null) {//如果月龄未完成赋值 - 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()); - } - } - } - } - } - - + //根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐） + checkModel.distOldTcType(babyModel); + model.setTcType(checkModel.getTcType()); model.setBabyName(babyModel.getName()); model.setBabyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); model.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 11133f0..894fdeb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -440,6 +440,9 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("patientId", ""); initQueryMap.put("pid", ""); Map normalQueryMap = new LinkedHashMap<>(); + normalQueryMap.put("apgarScorePf1", "Apgar1分钟"); + normalQueryMap.put("apgarScorePf5", "Apgar5分钟"); + normalQueryMap.put("apgarScorePf10", "Apgar10分钟"); normalQueryMap.put("dueDate", "分娩日期"); normalQueryMap.put("name", "姓名"); normalQueryMap.put("age", "年龄"); @@ -455,6 +458,9 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { normalQueryMap.put("patientId", ""); normalQueryMap.put("pid", ""); Map areaQueryMap = new LinkedHashMap<>(); + areaQueryMap.put("apgarScorePf1", "Apgar1分钟"); + areaQueryMap.put("apgarScorePf5", "Apgar5分钟"); + areaQueryMap.put("apgarScorePf10", "Apgar10分钟"); areaQueryMap.put("dueDate", "分娩日期"); areaQueryMap.put("name", "姓名"); areaQueryMap.put("age", "年龄"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index e7dc3d0..5ff7925 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -703,7 +703,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert