Commit 6011d8e3ce90a9c7da97ff2b43f4f645f8e99c24

Authored by jiangjiazhi
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 6011d8e
... ... @@ -2417,7 +2417,7 @@
2417 2417 BabyGrowthCountResult growW5 = new BabyGrowthCountResult();
2418 2418 growW5.setBzc("-3SD - -2SD");
2419 2419 growW5.setEvaluate("中下");
2420   - list2.add(growH5);
  2420 + list2.add(growW5);
2421 2421  
2422 2422 BabyGrowthCountResult growW6 = new BabyGrowthCountResult();
2423 2423 growW6.setBzc("< -3SD");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 6011d8e
... ... @@ -1067,6 +1067,8 @@
1067 1067 // 电话转换
1068 1068 childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
1069 1069 childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone()));
  1070 + // 加密身份证号
  1071 + childbirthManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo()));
1070 1072 // 查询分娩方式
1071 1073 String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
1072 1074 Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);