jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2bd54a75e15870579e410a7841c413e5fcae52ea

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

区域产妇和孕妇备注导出

Showing 5 changed files with 28 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 2bd54a7
... ... @@ -2234,6 +2234,7 @@
2234 2234 data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
2235 2235 data.put("serviceType", rp.getServiceType());
2236 2236 data.put("serviceStatus", rp.getServiceStatus());
  2237 +
2237 2238 datas.add(data);
2238 2239 }else if(patientsQueryRequest.getQueryType()==1){
2239 2240 //全部孕妇
... ... @@ -2261,6 +2262,7 @@
2261 2262 data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : com.lyms.platform.common.utils.StringUtils.encryPhone(rp.getRealPhone()));
2262 2263 data.put("serviceType", rp.getServiceType());
2263 2264 data.put("serviceStatus", rp.getServiceStatus());
  2265 + data.put("remark", rp.getRemark());
2264 2266 datas.add(data);
2265 2267 }else {
2266 2268 //全部产妇
... ... @@ -2280,6 +2282,7 @@
2280 2282 data.put("bTime", rp.getbTime());
2281 2283 data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
2282 2284 data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo()));
  2285 + data.put("remark", rp.getRemark());
2283 2286 datas.add(data);
2284 2287 }
2285 2288 }
... ... @@ -2328,6 +2331,7 @@
2328 2331 cnames.put("phone", "联系方式");
2329 2332 cnames.put("serviceType", "服务类型");
2330 2333 cnames.put("serviceStatus", "服务状态");
  2334 + cnames.put("remark", "备注");
2331 2335 }else {
2332 2336 //全部产妇
2333 2337 cnames.put("name", "姓名");
... ... @@ -2345,6 +2349,7 @@
2345 2349 cnames.put("bTime", "建档日期");
2346 2350 cnames.put("phone", "联系方式");
2347 2351 cnames.put("cardNo", "身份证号码");
  2352 + cnames.put("remark", "备注");
2348 2353 }
2349 2354 OutputStream out = response.getOutputStream();
2350 2355 ExcelUtil.toExcel(out, datas, cnames);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ 2bd54a7
... ... @@ -108,6 +108,16 @@
108 108 private String chfs;
109 109 private String chfc;
110 110  
  111 + private String remark;
  112 +
  113 + public String getRemark() {
  114 + return remark;
  115 + }
  116 +
  117 + public void setRemark(String remark) {
  118 + this.remark = remark;
  119 + }
  120 +
111 121 public String getCardNo() {
112 122 return cardNo;
113 123 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ 2bd54a7
... ... @@ -102,6 +102,16 @@
102 102 //秦皇岛乳房检查状态0：未做,1：已做。 是否检查
103 103 private String breastType;
104 104  
  105 + private String remark;
  106 +
  107 + public String getRemark() {
  108 + return remark;
  109 + }
  110 +
  111 + public void setRemark(String remark) {
  112 + this.remark = remark;
  113 + }
  114 +
105 115 public String getBreastType() {
106 116 return breastType;
107 117 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ 2bd54a7
... ... @@ -91,6 +91,7 @@
91 91 QuanChanResult chanResult = new QuanChanResult();
92 92 chanResult.setVcCardNo(patients.getVcCardNo());
93 93 chanResult.setCardNo(patients.getCardNo());
  94 + chanResult.setRemark(patients.getMremark());
94 95  
95 96 chanResult.setYi("-");
96 97 chanResult.setEr("-");
... ... @@ -224,6 +225,7 @@
224 225 try {
225 226 if (StringUtils.isNotEmpty(patients.getSource())) {
226 227 Patients pat = patientsService.findOnePatientById(patients.getSource());
  228 + chanResult.setRemark(pat.getMremark());
227 229 chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName());
228 230 } else {
229 231 chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ 2bd54a7
... ... @@ -77,6 +77,7 @@
77 77 QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
78 78 quanPatientsResult.setVcCardNo(patients.getVcCardNo());
79 79 quanPatientsResult.setCardNo(patients.getCardNo());
  80 + quanPatientsResult.setRemark(patients.getMremark());
80 81  
81 82 quanPatientsResult.setYi("-");
82 83 quanPatientsResult.setEr("-");