diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 8e11474..bddab37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1020,9 +1020,20 @@ public class SieveFacade { data.put("cqStatus", sive.getCqStatus()); data.put("cqResult", sive.getCqResult()); data.put("renShenResult", sive.getRenShenResult()); - data.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(sive.getRealPhone())); +// data.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(sive.getRealPhone())); + data.put("phone", sive.getRealPhone()); data.put("remarkTypeText", sive.getCsRemarkTypeText()); data.put("detail", sive.getDetail()); + + data.put("number", sive.getNumber()); + data.put("weight", sive.getWeight()); + data.put("lastMenstrual", sive.getLastMenstrual()); + data.put("sieveType", sive.getSieveType()); + data.put("costType", sive.getCostType()); + data.put("collectionDate", sive.getCollectionDate()); + data.put("applyDoctor", sive.getApplyDoctor()); + data.put("residence", sive.getResidence()); + datas.add(data); } } @@ -1041,6 +1052,16 @@ public class SieveFacade { cnames.put("phone", "联系方式"); cnames.put("remarkTypeText", "备注"); cnames.put("detail", "详情"); + + cnames.put("number", "标本号"); + cnames.put("weight", "体重"); + cnames.put("lastMenstrual", "末次月经"); + cnames.put("sieveType", "产筛类型"); + cnames.put("costType", "收费类型"); + cnames.put("collectionDate", "采血时间"); + cnames.put("applyDoctor", "送检医生"); + cnames.put("residence", "孕妇住址"); + response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8"); response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls"); @@ -3141,6 +3162,7 @@ public class SieveFacade { private void cnamesRegionalCqsievesMap(Map cnames) { cnames.put("姓名", "姓名"); cnames.put("年龄", "年龄"); + cnames.put("联系方式", "联系方式"); cnames.put("申请时间", "申请时间"); cnames.put("申请孕周", "申请孕周"); cnames.put("采血时间", "采血时间"); @@ -3180,6 +3202,7 @@ public class SieveFacade { Map data = new HashMap<>(); data.put("姓名", sive.getName()); data.put("年龄", sive.getAge()); + data.put("联系方式", sive.getPhone()); data.put("申请时间", sive.getApplyTime()); data.put("申请孕周", sive.getDueWeek()); data.put("采血时间", sive.getCollectionDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 91bab1f..7a27818 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -16,6 +16,18 @@ import java.util.Map; public class SieveListResult implements IBasicResultConvert { public static final String SPIT = "-"; + /** + * null/1 血清学筛查 2/无创基因筛查 3/二者都用 + */ + private String sieveType; + + /** + * 1/免费 2/自费 + */ + private String costType; + //体重 + private String weight; + private String sjgjx;// 神经管畸形 private String sbst;// 18-三体 private String tszhz;// 21 唐氏综合症 @@ -506,6 +518,30 @@ public class SieveListResult implements IBasicResultConvert> { //B超信息 //血清 if ("1".equals(sieveApplyOrderModel.getSieveType())) { + sieveListResult.setSieveType("血清学筛查"); String bpd = null; String crl = null; bpd = StringUtils.isNotEmpty(sieveApplyOrderModel.getBpd()) ? "BPD:" + sieveApplyOrderModel.getBpd() : ""; crl = StringUtils.isNotEmpty(sieveApplyOrderModel.getCrl()) ? "CRL:" + sieveApplyOrderModel.getCrl() : ""; sieveListResult.setbScanInfo(bpd + "," + crl); } else if ("2".equals(sieveApplyOrderModel.getSieveType())) { + sieveListResult.setSieveType("无创基因筛查"); sieveListResult.setbScanInfo(StringUtils.isNotEmpty(sieveApplyOrderModel.getFetusNum()) ? data.get(sieveApplyOrderModel.getFetusNum()) : "--"); } + if("1".equals(sieveApplyOrderModel.getCostType())){ + sieveListResult.setCostType("免费"); + }else if ("2".equals(sieveApplyOrderModel.getCostType())){ + sieveListResult.setCostType("自费"); + } + sieveListResult.setWeight(sieveApplyOrderModel.getWeight()); } List list1 = antService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(list1)) {