Commit 9270d23d8b7bcc45ec30cf9f1a577d9562ea37bf
1 parent
008605a2cd
Exists in
master
and in
6 other branches
儿保数据同步
Showing 3 changed files with 51 additions and 37 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
View file @
9270d23
| ... | ... | @@ -72,8 +72,8 @@ |
| 72 | 72 | //身长别体重 |
| 73 | 73 | private String heightWeight; |
| 74 | 74 | private String chestw; |
| 75 | - | |
| 76 | - | |
| 75 | + //前囟 | |
| 76 | + private String bregma; | |
| 77 | 77 | //发育评价 |
| 78 | 78 | private String growthEvaluate; |
| 79 | 79 | /******一般检查****/ |
| ... | ... | @@ -87,8 +87,7 @@ |
| 87 | 87 | //胆红素 腹 |
| 88 | 88 | private String bilirubinBelly; |
| 89 | 89 | |
| 90 | - //前囟 | |
| 91 | - private String bregma; | |
| 90 | + | |
| 92 | 91 | |
| 93 | 92 | //牙齿 |
| 94 | 93 | private String tooth; |
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java
View file @
9270d23
| ... | ... | @@ -191,11 +191,11 @@ |
| 191 | 191 | * @return |
| 192 | 192 | */ |
| 193 | 193 | public static BabyCheckPaedia convertToBabyCheckPaedia(BabyCheckModel babyCheckModel) { |
| 194 | - BabyCheckPaedia babyCheckBase = new BabyCheckPaedia(); | |
| 194 | + BabyCheckPaedia babyPaedia = new BabyCheckPaedia(); | |
| 195 | 195 | if (checkBabyCheckPaedia(babyCheckModel)) { |
| 196 | - babyCheckBase.setBilirubinHead(babyCheckModel.getBilirubinHead()); | |
| 197 | - babyCheckBase.setBilirubinChest(babyCheckModel.getBilirubinChest()); | |
| 198 | - babyCheckBase.setBilirubinBelly(babyCheckModel.getBilirubinBelly()); | |
| 196 | + babyPaedia.setBilirubinHead(babyCheckModel.getBilirubinHead()); | |
| 197 | + babyPaedia.setBilirubinChest(babyCheckModel.getBilirubinChest()); | |
| 198 | + babyPaedia.setBilirubinBelly(babyCheckModel.getBilirubinBelly()); | |
| 199 | 199 | String bregma = ""; |
| 200 | 200 | String bregmaValue = ""; |
| 201 | 201 | if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getBregma())) { |
| 202 | 202 | |
| 203 | 203 | |
| 204 | 204 | |
| 205 | 205 | |
| ... | ... | @@ -210,45 +210,45 @@ |
| 210 | 210 | bregma = one + "cm - " + two + "cm"; |
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | - babyCheckBase.setBregma(bregma); | |
| 213 | + babyPaedia.setBregma(bregma); | |
| 214 | 214 | |
| 215 | - babyCheckBase.setTooth(babyCheckModel.getTooth()); | |
| 216 | - babyCheckBase.setFaceColor(babyCheckModel.getFaceColor()); | |
| 217 | - babyCheckBase.setSkin(babyCheckModel.getSkin()); | |
| 218 | - babyCheckBase.setEye(babyCheckModel.getEye()); | |
| 219 | - babyCheckBase.setEyesight(babyCheckModel.getEyesight()); | |
| 220 | - babyCheckBase.setEar(babyCheckModel.getEar()); | |
| 221 | - babyCheckBase.setHearing(babyCheckModel.getHearing()); | |
| 222 | - babyCheckBase.setNeck(babyCheckModel.getNeck()); | |
| 223 | - babyCheckBase.setChest(babyCheckModel.getChest()); | |
| 224 | - babyCheckBase.setBelly(babyCheckModel.getBelly()); | |
| 225 | - babyCheckBase.setSpineFours(babyCheckModel.getSpineFours()); | |
| 226 | - babyCheckBase.setPortaGenitals(babyCheckModel.getPortaGenitals()); | |
| 227 | - babyCheckBase.setStepStatus(babyCheckModel.getStepStatus()); | |
| 228 | - babyCheckBase.setStoopSign(babyCheckModel.getStoopSign()); | |
| 229 | - babyCheckBase.setStoopStatus(babyCheckModel.getStoopStatus()); | |
| 230 | - babyCheckBase.setNerve(babyCheckModel.getNerve()); | |
| 231 | - babyCheckBase.setKq(babyCheckModel.getKq()); | |
| 232 | - babyCheckBase.setCyNum(babyCheckModel.getCyNum()); | |
| 233 | - babyCheckBase.setQcNum(babyCheckModel.getQcNum()); | |
| 234 | - babyCheckBase.setBtt(babyCheckModel.getBtt()); | |
| 235 | - babyCheckBase.setXf(babyCheckModel.getXf()); | |
| 215 | + babyPaedia.setTooth(babyCheckModel.getTooth()); | |
| 216 | + babyPaedia.setFaceColor(babyCheckModel.getFaceColor()); | |
| 217 | + babyPaedia.setSkin(babyCheckModel.getSkin()); | |
| 218 | + babyPaedia.setEye(babyCheckModel.getEye()); | |
| 219 | + babyPaedia.setEyesight(babyCheckModel.getEyesight()); | |
| 220 | + babyPaedia.setEar(babyCheckModel.getEar()); | |
| 221 | + babyPaedia.setHearing(babyCheckModel.getHearing()); | |
| 222 | + babyPaedia.setNeck(babyCheckModel.getNeck()); | |
| 223 | + babyPaedia.setChest(babyCheckModel.getChest()); | |
| 224 | + babyPaedia.setBelly(babyCheckModel.getBelly()); | |
| 225 | + babyPaedia.setSpineFours(babyCheckModel.getSpineFours()); | |
| 226 | + babyPaedia.setPortaGenitals(babyCheckModel.getPortaGenitals()); | |
| 227 | + babyPaedia.setStepStatus(babyCheckModel.getStepStatus()); | |
| 228 | + babyPaedia.setStoopSign(babyCheckModel.getStoopSign()); | |
| 229 | + babyPaedia.setStoopStatus(babyCheckModel.getStoopStatus()); | |
| 230 | + babyPaedia.setNerve(babyCheckModel.getNerve()); | |
| 231 | + babyPaedia.setKq(babyCheckModel.getKq()); | |
| 232 | + babyPaedia.setCyNum(babyCheckModel.getCyNum()); | |
| 233 | + babyPaedia.setQcNum(babyCheckModel.getQcNum()); | |
| 234 | + babyPaedia.setBtt(babyCheckModel.getBtt()); | |
| 235 | + babyPaedia.setXf(babyCheckModel.getXf()); | |
| 236 | 236 | |
| 237 | 237 | if (babyCheckModel.getNavel() != null && babyCheckModel.getNavel().size() > 0) { |
| 238 | 238 | Map<String, String> map = babyCheckModel.getNavel(); |
| 239 | 239 | if ("4".equals(map.get("select").toString())) { |
| 240 | - babyCheckBase.setUmbilical(map.get("other")); | |
| 240 | + babyPaedia.setUmbilical(map.get("other")); | |
| 241 | 241 | } else { |
| 242 | 242 | String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString())); |
| 243 | - babyCheckBase.setUmbilical(value); | |
| 243 | + babyPaedia.setUmbilical(value); | |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - babyCheckBase.setOtherText(babyCheckModel.getBabyCheckOther()); | |
| 249 | - babyCheckBase.setCreated(babyCheckModel.getCreated()); | |
| 250 | - babyCheckBase.setModified(babyCheckModel.getModified()); | |
| 251 | - return babyCheckBase; | |
| 248 | + babyPaedia.setOtherText(babyCheckModel.getBabyCheckOther()); | |
| 249 | + babyPaedia.setCreated(babyCheckModel.getCreated()); | |
| 250 | + babyPaedia.setModified(babyCheckModel.getModified()); | |
| 251 | + return babyPaedia; | |
| 252 | 252 | } |
| 253 | 253 | return null; |
| 254 | 254 | } |
| ... | ... | @@ -287,6 +287,21 @@ |
| 287 | 287 | babyCheckCommonly.setHead(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getHead(), UnitConstants.CM)); |
| 288 | 288 | babyCheckCommonly.setHeight(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getHeight(), UnitConstants.CM)); |
| 289 | 289 | babyCheckCommonly.setHeightWeight(babyCheckModel.getHeightWeight()); |
| 290 | + String bregma = ""; | |
| 291 | + String bregmaValue = ""; | |
| 292 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getBregma())) { | |
| 293 | + Map map = JsonUtil.str2Obj(babyCheckModel.getBregma(), Map.class); | |
| 294 | + String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString(); | |
| 295 | + if ("yes".equals(yesOrNo)) { | |
| 296 | + bregma = "闭合"; | |
| 297 | + } else if ("no".equals(yesOrNo)) { | |
| 298 | +// bregma = "未闭合"; | |
| 299 | + String one = map.get("wbhcc1") == null ? "" : map.get("wbhcc1").toString(); | |
| 300 | + String two = map.get("wbhcc2") == null ? "" : map.get("wbhcc2").toString(); | |
| 301 | + bregma = one + "cm - " + two + "cm"; | |
| 302 | + } | |
| 303 | + } | |
| 304 | + babyCheckCommonly.setBregma(bregma); | |
| 290 | 305 | return babyCheckCommonly; |
| 291 | 306 | } |
| 292 | 307 | return null; |
platform-job-index/src/main/webapp/WEB-INF/lib/mainData.jar
View file @
9270d23