jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 68c9a83318b5a6d55a0d3b3e7cbf41baa30c2917

Authored by liquanyu
1 parent 4ce2dedb00
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

衡水导出

Showing 7 changed files with 309 additions and 47 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 68c9a83
... ... @@ -180,6 +180,16 @@
180 180 BaseListResponse baseListResponse;
181 181 childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
182 182 String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
  183 +
  184 + String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
  185 +
  186 + Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId));
  187 + if (o != null && "12".equals(o.getCityId()))
  188 + {
  189 + childbirthManagerRequest.setInitQuery(hsColum);
  190 + childbirthManagerRequest.setInitQueryMap(childbirthManagerRequest.getInitQueryMapHs());
  191 + }
  192 +
183 193 try {
184 194 Map<String, String> query;
185 195 if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 68c9a83
... ... @@ -86,8 +86,9 @@
86 86 @Autowired
87 87 private AntenatalExaminationFacade antenatalExaminationFacade;
88 88  
89   -
90 89 @Autowired
  90 + private ApplyOrderService applyOrderService;
  91 + @Autowired
91 92 private AntenatalExaminationService antenatalExaminationService;
92 93  
93 94 public void syncAntRecordToList(String hospitalId) {
... ... @@ -679,7 +680,7 @@
679 680 end = antExRecordModelList.size();
680 681 }
681 682 listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion,
682   - organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService, patientsService)));
  683 + organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService, patientsService,applyOrderService)));
683 684 }
684 685 for (Future f : listFuture) {
685 686 try {
686 687  
687 688  
688 689  
689 690  
690 691  
691 692  
... ... @@ -943,53 +944,113 @@
943 944 }
944 945  
945 946 public void exportfindRegionAntEx(AntExManagerQueryRequest antExManagerQueryRequest, Integer id, boolean b, HttpServletResponse httpServletResponse) {
  947 +
  948 +
  949 +
  950 +
946 951 BaseListResponse listRep = (BaseListResponse) findList(antExManagerQueryRequest, id, b, null, false);
947 952 List<Map<String, Object>> datas = new ArrayList<>();
948   - try {
949 953  
950   - if (listRep != null) {
951   - List<AntExManagerResult> list = listRep.getData();
952   - if (CollectionUtils.isNotEmpty(list)) {
953   - for (AntExManagerResult aer : list) {
954   - Map<String, Object> data = new HashMap<>();
955   - data.put("checkTime", aer.getCheckTime());
956   - data.put("name", aer.getName());
957   - data.put("age", aer.getAge());
958   - data.put("cDueWeek", aer.getcDueWeek());
959   - data.put("rLevel", getLevel(aer.getrLevel()));
960   - data.put("riskFactor", aer.getRiskFactor());
961   - data.put("riskScore", aer.getRiskScore());
962   - data.put("chTimes", aer.getChTimes());
963   - data.put("tTimes", aer.gettTimes());
964   - data.put("dueDate", aer.getDueDate());
965   - data.put("addr", aer.getAddr());
966   - data.put("checkHospital", aer.getCheckHospital());
967   - datas.add(data);
  954 + Organization organization = organizationService.getOrganization(Integer.parseInt(autoMatchFacade.getHospitalId(id)));
  955 + if (organization != null && organization.getCityId().equals("12"))
  956 + {
  957 + try {
  958 +
  959 + if (listRep != null) {
  960 + List<AntExManagerResult> list = listRep.getData();
  961 + if (CollectionUtils.isNotEmpty(list)) {
  962 + for (AntExManagerResult aer : list) {
  963 + Map<String, Object> data = new HashMap<>();
  964 + data.put("checkTime", aer.getCheckTime());
  965 + data.put("name", aer.getName());
  966 + data.put("age", aer.getAge());
  967 + data.put("cDueWeek", aer.getcDueWeek());
  968 + data.put("rLevel", getLevel(aer.getrLevel()));
  969 + data.put("riskFactor", aer.getRiskFactor());
  970 + data.put("riskScore", aer.getRiskScore());
  971 + data.put("chTimes", aer.getChTimes());
  972 + data.put("tTimes", aer.gettTimes());
  973 + data.put("dueDate", aer.getDueDate());
  974 + data.put("addr", aer.getAddr());
  975 + data.put("checkHospital", aer.getCheckHospital());
  976 + datas.add(data);
  977 + }
968 978 }
969 979 }
  980 +
  981 + OutputStream out = httpServletResponse.getOutputStream();
  982 + Map<String, String> cnames = new LinkedHashMap<>();
  983 + cnames.put("checkTime", "产检日期");
  984 + cnames.put("name", "姓名");
  985 + cnames.put("age", "年龄");
  986 + cnames.put("cDueWeek", "产检孕周");
  987 + cnames.put("rLevel", "高危等级");
  988 + cnames.put("riskFactor", "高危因素");
  989 + cnames.put("riskScore", "高危评分");
  990 + cnames.put("chTimes", "本院产检第次");
  991 + cnames.put("tTimes", "总产检第次");
  992 + cnames.put("dueDate", "预产期");
  993 + cnames.put("addr", "居住地");
  994 + cnames.put("checkHospital", "产检医院");
  995 + httpServletResponse.setContentType("application/octet-stream");
  996 + httpServletResponse.setCharacterEncoding("UTF-8");
  997 + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls");
  998 + ExcelUtil.toExcel(out, datas, cnames);
  999 + } catch (IOException e) {
  1000 + e.printStackTrace();
970 1001 }
  1002 + }
  1003 + else
  1004 + {
  1005 + try {
971 1006  
972   - OutputStream out = httpServletResponse.getOutputStream();
973   - Map<String, String> cnames = new LinkedHashMap<>();
974   - cnames.put("checkTime", "产检日期");
975   - cnames.put("name", "姓名");
976   - cnames.put("age", "年龄");
977   - cnames.put("cDueWeek", "产检孕周");
978   - cnames.put("rLevel", "高危等级");
979   - cnames.put("riskFactor", "高危因素");
980   - cnames.put("riskScore", "高危评分");
981   - cnames.put("chTimes", "本院产检第次");
982   - cnames.put("tTimes", "总产检第次");
983   - cnames.put("dueDate", "预产期");
984   - cnames.put("addr", "居住地");
985   - cnames.put("checkHospital", "产检医院");
986   - httpServletResponse.setContentType("application/octet-stream");
987   - httpServletResponse.setCharacterEncoding("UTF-8");
988   - httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls");
989   - ExcelUtil.toExcel(out, datas, cnames);
990   - } catch (IOException e) {
991   - e.printStackTrace();
  1007 + if (listRep != null) {
  1008 + List<AntExManagerResult> list = listRep.getData();
  1009 + if (CollectionUtils.isNotEmpty(list)) {
  1010 + for (AntExManagerResult aer : list) {
  1011 + Map<String, Object> data = new HashMap<>();
  1012 + data.put("checkTime", aer.getCheckTime());
  1013 + data.put("name", aer.getName());
  1014 + data.put("age", aer.getAge());
  1015 + data.put("cDueWeek", aer.getcDueWeek());
  1016 + data.put("rLevel", getLevel(aer.getrLevel()));
  1017 + data.put("riskFactor", aer.getRiskFactor());
  1018 + data.put("riskScore", aer.getRiskScore());
  1019 + data.put("chTimes", aer.getChTimes());
  1020 + data.put("tTimes", aer.gettTimes());
  1021 + data.put("dueDate", aer.getDueDate());
  1022 + data.put("addr", aer.getAddr());
  1023 + data.put("checkHospital", aer.getCheckHospital());
  1024 + datas.add(data);
  1025 + }
  1026 + }
  1027 + }
  1028 +
  1029 + OutputStream out = httpServletResponse.getOutputStream();
  1030 + Map<String, String> cnames = new LinkedHashMap<>();
  1031 + cnames.put("checkTime", "产检日期");
  1032 + cnames.put("name", "姓名");
  1033 + cnames.put("age", "年龄");
  1034 + cnames.put("cDueWeek", "产检孕周");
  1035 + cnames.put("rLevel", "高危等级");
  1036 + cnames.put("riskFactor", "高危因素");
  1037 + cnames.put("riskScore", "高危评分");
  1038 + cnames.put("chTimes", "本院产检第次");
  1039 + cnames.put("tTimes", "总产检第次");
  1040 + cnames.put("dueDate", "预产期");
  1041 + cnames.put("addr", "居住地");
  1042 + cnames.put("checkHospital", "产检医院");
  1043 + httpServletResponse.setContentType("application/octet-stream");
  1044 + httpServletResponse.setCharacterEncoding("UTF-8");
  1045 + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls");
  1046 + ExcelUtil.toExcel(out, datas, cnames);
  1047 + } catch (IOException e) {
  1048 + e.printStackTrace();
  1049 + }
992 1050 }
  1051 +
  1052 +
  1053 +
993 1054  
994 1055 }
995 1056  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 68c9a83
... ... @@ -219,6 +219,7 @@
219 219 }
220 220  
221 221 private Map<String, String> initQueryMap;
  222 + private Map<String, String> initQueryMapHs;
222 223  
223 224 private Map<String, String> normalQueryMap;
224 225  
... ... @@ -228,6 +229,14 @@
228 229  
229 230 private Integer operatorId;
230 231  
  232 + public Map<String, String> getInitQueryMapHs() {
  233 + return initQueryMapHs;
  234 + }
  235 +
  236 + public void setInitQueryMapHs(Map<String, String> initQueryMapHs) {
  237 + this.initQueryMapHs = initQueryMapHs;
  238 + }
  239 +
231 240 public Map<String, String> getInitQueryMap() {
232 241 return initQueryMap;
233 242 }
... ... @@ -489,6 +498,67 @@
489 498 initQueryMap.put("maternalDeliverId", "");
490 499 initQueryMap.put("patientId", "");
491 500 initQueryMap.put("pid", "");
  501 +
  502 +
  503 + //衡水导出
  504 + Map<String, String> initQueryMapHs = new LinkedHashMap<>();
  505 + initQueryMapHs.put("vcCardNo", "卡号");
  506 + initQueryMapHs.put("name", "妇女姓名");
  507 + initQueryMapHs.put("cardNo", "妇女证件号码");
  508 + initQueryMapHs.put("phone", "妇女联系方式");
  509 + initQueryMapHs.put("husbandName", "丈夫姓名");
  510 + initQueryMapHs.put("husbandCardNo", "丈夫证件号码");
  511 + initQueryMapHs.put("husbandPhone", "丈夫联系方式");
  512 + initQueryMapHs.put("pliveTypeId", "居住类别");
  513 + initQueryMapHs.put("pcensusTypeId", "户口类型");
  514 + initQueryMapHs.put("registerAddress", "户籍地");
  515 + initQueryMapHs.put("address", "现住址");
  516 + initQueryMapHs.put("postAddress", "产后休养地");
  517 + initQueryMapHs.put("dueDate", "分娩日期");
  518 + initQueryMapHs.put("fileCode", "住院号");
  519 + initQueryMapHs.put("chBpSsy1", "收缩压");
  520 + initQueryMapHs.put("chBpSzy1", "舒张压");
  521 + initQueryMapHs.put("dueWeek", "孕周");
  522 + initQueryMapHs.put("fetalPosition", "胎方位");
  523 + initQueryMapHs.put("heartRate", "胎心");
  524 + initQueryMapHs.put("fetalPresentation", "先露");
  525 + initQueryMapHs.put("perinealCondition", "会阴情况");
  526 + initQueryMapHs.put("deliveryMode", "分娩方式");
  527 + initQueryMapHs.put("breath", "呼吸");
  528 + initQueryMapHs.put("needleNum", "缝线针数");
  529 + initQueryMapHs.put("pulse", "脉搏");
  530 + initQueryMapHs.put("prodprocessOne", "第一产程");
  531 + initQueryMapHs.put("prodprocessTwo", "第二产程");
  532 + initQueryMapHs.put("prodprocessThree", "第三产程");
  533 + initQueryMapHs.put("totalprocess", "总产程");
  534 + initQueryMapHs.put("ohloseBloodL", "产后1小时失血量");
  535 + initQueryMapHs.put("thloseBloodL", "产后2小时失血量");
  536 + initQueryMapHs.put("rhloseBloodL", "产后24小时内失血量");
  537 + initQueryMapHs.put("loseBloodCause", "失血原因");
  538 + initQueryMapHs.put("tpmcType", "胎盘娩出方式");
  539 + initQueryMapHs.put("tpSize", "胎盘大小");
  540 + initQueryMapHs.put("tpWeight", "胎盘重量");
  541 + initQueryMapHs.put("umbilicalCordLength", "脐带长度");
  542 + initQueryMapHs.put("umbilicalCordEx", "脐带是否异常");
  543 + initQueryMapHs.put("umbilicalCordExType", "脐带异常类型");
  544 + initQueryMapHs.put("tireNumber", "胎数");
  545 + initQueryMapHs.put("maternalInfo", "产妇情况");
  546 + initQueryMapHs.put("operationCause", "手术原因");
  547 + initQueryMapHs.put("fmHospital", "分娩机构");
  548 + initQueryMapHs.put("deliverDoctor", "接生者");
  549 + initQueryMapHs.put("sex", "儿童性别");
  550 + initQueryMapHs.put("babyWeight", "儿童体重");
  551 + initQueryMapHs.put("babyHeight", "儿童身长");
  552 + initQueryMapHs.put("apgarScorePf1", "Apgar1分钟");
  553 + initQueryMapHs.put("apgarScorePf5", "Apgar5分钟");
  554 + initQueryMapHs.put("apgarScorePf10", "Apgar10分钟");
  555 + initQueryMapHs.put("pregnancyOut", "妊娠结局");
  556 + initQueryMapHs.put("asphyxiaM", "窒息分钟数");
  557 + initQueryMapHs.put("deathCause", "原因");
  558 + initQueryMapHs.put("babyHealthy", "新生儿疾病");
  559 + initQueryMapHs.put("malformation", "畸形");
  560 +
  561 +
492 562 Map<String, String> normalQueryMap = new LinkedHashMap<>();
493 563 normalQueryMap.put("apgarScorePf1", "Apgar1分钟");
494 564 normalQueryMap.put("apgarScorePf5", "Apgar5分钟");
... ... @@ -532,6 +602,7 @@
532 602 areaQueryMap.put("patientId", "");
533 603 areaQueryMap.put("pid", "");
534 604 this.initQueryMap = initQueryMap;
  605 + this.initQueryMapHs = initQueryMapHs;
535 606 this.normalQueryMap = normalQueryMap;
536 607 this.areaQueryMap = areaQueryMap;
537 608 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java View file @ 68c9a83
... ... @@ -60,11 +60,61 @@
60 60  
61 61 private String checkHospital;
62 62  
  63 + //户籍地址
63 64 private String addr;
64 65 //产次
65 66 private int cTimes=1;
66 67  
67 68 private int levelNum;
  69 + private String vcCardNo;
  70 + private String cardNo;
  71 + private String isSieve;
  72 +
  73 + //产后修养地
  74 + private String postAddress;
  75 +
  76 + //居住地址
  77 + private String address;
  78 +
  79 + public String getCardNo() {
  80 + return cardNo;
  81 + }
  82 +
  83 + public void setCardNo(String cardNo) {
  84 + this.cardNo = cardNo;
  85 + }
  86 +
  87 + public String getIsSieve() {
  88 + return isSieve;
  89 + }
  90 +
  91 + public void setIsSieve(String isSieve) {
  92 + this.isSieve = isSieve;
  93 + }
  94 +
  95 + public String getPostAddress() {
  96 + return postAddress;
  97 + }
  98 +
  99 + public void setPostAddress(String postAddress) {
  100 + this.postAddress = postAddress;
  101 + }
  102 +
  103 + public String getAddress() {
  104 + return address;
  105 + }
  106 +
  107 + public void setAddress(String address) {
  108 + this.address = address;
  109 + }
  110 +
  111 + public String getVcCardNo() {
  112 + return vcCardNo;
  113 + }
  114 +
  115 + public void setVcCardNo(String vcCardNo) {
  116 + this.vcCardNo = vcCardNo;
  117 + }
68 118  
69 119 public int getLevelNum() {
70 120 return levelNum;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ 68c9a83
... ... @@ -129,6 +129,10 @@
129 129 * @discription 丈夫联系方式
130 130 */
131 131 private String husbandPhone;
  132 + private String husbandName;
  133 + private String husbandCardNo;
  134 + private String registerAddress;
  135 + private String postAddress;
132 136 // 基本信息结束
133 137  
134 138 // 分娩信息开始
... ... @@ -436,6 +440,38 @@
436 440  
437 441 //手动分娩孕周
438 442 private String handDueWeek;
  443 +
  444 + public String getHusbandName() {
  445 + return husbandName;
  446 + }
  447 +
  448 + public void setHusbandName(String husbandName) {
  449 + this.husbandName = husbandName;
  450 + }
  451 +
  452 + public String getHusbandCardNo() {
  453 + return husbandCardNo;
  454 + }
  455 +
  456 + public void setHusbandCardNo(String husbandCardNo) {
  457 + this.husbandCardNo = husbandCardNo;
  458 + }
  459 +
  460 + public String getRegisterAddress() {
  461 + return registerAddress;
  462 + }
  463 +
  464 + public void setRegisterAddress(String registerAddress) {
  465 + this.registerAddress = registerAddress;
  466 + }
  467 +
  468 + public String getPostAddress() {
  469 + return postAddress;
  470 + }
  471 +
  472 + public void setPostAddress(String postAddress) {
  473 + this.postAddress = postAddress;
  474 + }
439 475  
440 476 public String getHandDueWeek() {
441 477 return handDueWeek;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java View file @ 68c9a83
1 1 package com.lyms.platform.operate.web.worker;
2 2  
3 3 import com.lyms.platform.biz.service.*;
  4 +import com.lyms.platform.common.enums.YnEnums;
4 5 import com.lyms.platform.common.utils.ExceptionUtils;
5 6 import com.lyms.platform.common.utils.StringUtils;
6 7 import com.lyms.platform.operate.web.result.AntExManagerResult;
... ... @@ -14,6 +15,7 @@
14 15 import com.lyms.platform.pojo.AntenatalExaminationModel;
15 16 import com.lyms.platform.pojo.Patients;
16 17 import com.lyms.platform.query.AntExRecordQuery;
  18 +import com.lyms.platform.query.SieveApplyOrderQuery;
17 19 import org.apache.commons.collections.CollectionUtils;
18 20 import org.apache.commons.lang.math.NumberUtils;
19 21  
... ... @@ -44,7 +46,7 @@
44 46 private AntenatalExaminationService antenatalExaminationService;
45 47  
46 48 public SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd");
47   -
  49 + ApplyOrderService applyOrderService;
48 50 public AntExRecordWorker(List<AntExRecordModel> record,
49 51 boolean isRegion,
50 52 OrganizationService organizationService,
... ... @@ -53,7 +55,8 @@
53 55 CommonService commonService,
54 56 String hospital,
55 57 BasicConfigService basicConfigService,
56   - AntenatalExaminationService antenatalExaminationService,PatientsService patientsService) {
  58 + AntenatalExaminationService antenatalExaminationService,PatientsService patientsService,
  59 + ApplyOrderService applyOrderService) {
57 60 this.record = record;
58 61 this.isRegion = isRegion;
59 62 this.organizationService = organizationService;
... ... @@ -64,6 +67,7 @@
64 67 this.basicConfigService = basicConfigService;
65 68 this.antenatalExaminationService = antenatalExaminationService;
66 69 this.patientsService = patientsService;
  70 + this.applyOrderService = applyOrderService;
67 71 }
68 72  
69 73 @Override
... ... @@ -145,6 +149,23 @@
145 149 antExManagerResult.settTimes(tcount - tallcount);
146 150 antExManagerResult.setChTimes(dichi - cdichi);
147 151 handleRisk(e, antExManagerResult);
  152 +
  153 +
  154 + if (isRegion) {
  155 + antExManagerResult.setPostAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(),
  156 + patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService));
  157 +
  158 + antExManagerResult.setAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
  159 + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
  160 +
  161 + antExManagerResult.setVcCardNo(patients.getVcCardNo());
  162 + antExManagerResult.setCardNo(patients.getCardNo());
  163 + SieveApplyOrderQuery applyOrderQuery = new SieveApplyOrderQuery();
  164 + applyOrderQuery.setParentId(patients.getId());
  165 + applyOrderQuery.setYn(YnEnums.YES.getId());
  166 + antExManagerResult.setIsSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? "未做" : "已做");
  167 + }
  168 +
148 169  
149 170 data.add(antExManagerResult);
150 171 } catch (Exception e1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ 68c9a83
... ... @@ -105,14 +105,27 @@
105 105 if (initQuery.contains("address")) {
106 106 childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
107 107 }
  108 + //产后修养地址
  109 + if (initQuery.contains("postAddress")) {
  110 + childbirthManagerQueryModel.setPostAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(),
  111 + patients.getCityPostRestId(), patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService));
  112 + }
  113 +
  114 + // 户籍地址
  115 + if (initQuery.contains("registerAddress")) {
  116 + childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(),
  117 + patients.getStreetId(), patients.getAddress(), basicConfigService));
  118 + }
108 119 // 电话转换
109   - childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
110   - childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone()));
  120 + childbirthManagerQueryModel.setPhone(patients.getPhone());
  121 + childbirthManagerQueryModel.setHusbandPhone(patients.getHusbandPhone());
  122 + childbirthManagerQueryModel.setHusbandName(patients.getHusbandName());
  123 + childbirthManagerQueryModel.setHusbandCardNo(patients.getHcertificateNum());
111 124 // 加密身份证号
112   - childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
  125 + childbirthManagerQueryModel.setCardNo(patients.getCardNo());
113 126 // 年龄
114 127 childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
115   -
  128 + childbirthManagerQueryModel.setFileCode(maternalDeliverModel.getBhNum());
116 129 // 居住类型
117 130 if (initQuery.contains("pliveTypeId")) {
118 131 try {