liquanyu / regional-platform

Download as
Browse Code »

Commit c841834fad43631b99c00261c8e554d5e6533b9c

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

儿童儿保套餐

Showing 1 changed file with 17 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ c841834
... ... @@ -3097,6 +3097,8 @@
3097 3097  
3098 3098 private BabyCheckPageResult getBabyCheckResult(BabyCheckModel checkModel, BabyModel babyModel) {
3099 3099 BabyCheckPageResult model = new BabyCheckPageResult();
  3100 + //新加字段,检查套餐
  3101 + model.setTcType(checkModel.getTcType());
3100 3102  
3101 3103 if (babyModel != null) {
3102 3104 if (checkModel.getTcType() == null) {//历史数据不存在套餐处理成一个规则
... ... @@ -3145,19 +3147,21 @@
3145 3147 model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
3146 3148 }
3147 3149 }
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());
  3150 + if (model.getTcType() == null) {
  3151 + String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
  3152 + if (StringUtils.isNotEmpty(checkMonthAge)) {
  3153 + if (checkMonthAge.indexOf("岁") != -1) {
  3154 + String yearStr = checkMonthAge.substring(0, checkMonthAge.indexOf("岁"));
  3155 + int year = Integer.parseInt(yearStr);
  3156 + if (year == 3) {
  3157 + model.setTcType(ChildCareEnums.JCTCEnums.I.getId());
  3158 + } else if (year == 4) {
  3159 + model.setTcType(ChildCareEnums.JCTCEnums.J.getId());
  3160 + } else if (year == 5) {
  3161 + model.setTcType(ChildCareEnums.JCTCEnums.K.getId());
  3162 + } else if (year == 6) {
  3163 + model.setTcType(ChildCareEnums.JCTCEnums.L.getId());
  3164 + }
3161 3165 }
3162 3166 }
3163 3167 }
... ... @@ -3232,10 +3236,6 @@
3232 3236  
3233 3237 }
3234 3238 }
3235   - //新加字段
3236   - model.setTcType(checkModel.getTcType());
3237   -
3238   -
3239 3239 model.setCnqk(checkModel.getCnqk());
3240 3240 model.setMtcnNum(UnitUtils.unitSplice(checkModel.getMtcnNum(), UnitConstants.CI));
3241 3241 model.setXbNum(UnitUtils.unitSplice(checkModel.getXbNum(), UnitConstants.CI));