jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 24b80811ca406c9299b8f0bb27f43fbc5cfcb40e

Authored by jiangjiazhi
2 parents fd4be943bb 82e7433aeb
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 24b8081
... ... @@ -157,17 +157,13 @@
157 157 list.add(map);
158 158 }
159 159 Map<String, String> header = new LinkedHashMap<>();
160   - header.put("dueDate", "分娩日期");
161   - header.put("name", "姓名");
162   - header.put("age", "年龄");
163   - header.put("cardNo", "证件号");
164   - header.put("dueWeek", "分娩孕周");
165   - header.put("deliveryMode", "分娩方式");
166   - header.put("maternalInfo", "产妇情况");
167   - header.put("tireNumber", "胎数");
168   - header.put("livingNumber", "活产数");
169   - header.put("deliverDoctor", "接生医生");
170   - header.put("phone", "联系方式");
  160 + Map<String, String> temp = childbirthManagerRequest.getInitQueryMap();
  161 + String initQuery = childbirthManagerRequest.getInitQuery();
  162 + for (String key : temp.keySet()) {
  163 + if (initQuery.contains(key)) {
  164 + header.put(key, temp.get(key));
  165 + }
  166 + }
171 167 httpServletResponse.setContentType("application/force-download");
172 168 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("分娩管理.xls").getBytes("UTF-8"), "ISO-8859-1"));
173 169 ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 24b8081
... ... @@ -2282,7 +2282,23 @@
2282 2282 map.put("age",StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), checkModel.getCheckDate()))); //检查月龄
2283 2283 map.put("height",checkModel.getHeight()); //身长
2284 2284 map.put("weight", checkModel.getWeight()); //体重
2285   - map.put("growthEvaluate",checkModel.getGrowthEvaluate()); //体格发育评价
  2285 + StringBuffer sb = new StringBuffer();
  2286 + if (StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()))
  2287 + {
  2288 + List<String> items = JsonUtil.toList(checkModel.getGrowthEvaluate(),String.class);
  2289 + if (CollectionUtils.isNotEmpty(items))
  2290 + {
  2291 + for(int i = 0 ; i < items.size() ; i++)
  2292 + {
  2293 + sb.append(items.get(i));
  2294 + if (items.size() -1 != i)
  2295 + {
  2296 + sb.append(",");
  2297 + }
  2298 + }
  2299 + }
  2300 + }
  2301 + map.put("growthEvaluate",sb.toString()); //体格发育评价
2286 2302 map.put("checkDate",StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())));
2287 2303 String checkDoctorId = checkModel.getCheckDoctor() ;
2288 2304 String checkDoctor = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 24b8081
1 1 package com.lyms.platform.operate.web.request;
2 2  
  3 +import java.util.LinkedHashMap;
  4 +import java.util.Map;
  5 +
3 6 /**
4 7 * @auther HuJiaqi
5 8 * @createTime 2016年12月07日 14时07分
6 9  
... ... @@ -147,10 +150,20 @@
147 150 */
148 151 private String initQuery;
149 152  
  153 + private Map<String, String> initQueryMap;
  154 +
150 155 private boolean isExcel;
151 156  
152 157 private Integer operatorId;
153 158  
  159 + public Map<String, String> getInitQueryMap() {
  160 + return initQueryMap;
  161 + }
  162 +
  163 + public void setInitQueryMap(Map<String, String> initQueryMap) {
  164 + this.initQueryMap = initQueryMap;
  165 + }
  166 +
154 167 public boolean isExcel() {
155 168 return isExcel;
156 169 }
... ... @@ -325,6 +338,64 @@
325 338  
326 339 public void setOperatorId(Integer operatorId) {
327 340 this.operatorId = operatorId;
  341 + }
  342 +
  343 + public ChildbirthManagerRequest() {
  344 + Map<String, String> initQueryMap = new LinkedHashMap<>();
  345 + initQueryMap.put("dueDate", "分娩日期");
  346 + initQueryMap.put("name", "姓名");
  347 + initQueryMap.put("age", "年龄");
  348 + initQueryMap.put("cardNo", "证件号");
  349 + initQueryMap.put("dueWeek", "分娩孕周");
  350 + initQueryMap.put("deliveryMode", "分娩方式");
  351 + initQueryMap.put("maternalInfo", "产妇情况");
  352 + initQueryMap.put("tireNumber", "胎数");
  353 + initQueryMap.put("livingNumber", "活产数");
  354 + initQueryMap.put("deliverDoctor", "接生医生");
  355 + initQueryMap.put("phone", "联系方式");
  356 + initQueryMap.put("address", "居住地");
  357 + initQueryMap.put("pliveTypeId", "居住类型");
  358 + initQueryMap.put("pcensusTypeId", "户口类型");
  359 + initQueryMap.put("husbandPhone", "丈夫联系方式");
  360 + initQueryMap.put("fetalPosition", "胎方位");
  361 + initQueryMap.put("heartRate", "胎心率");
  362 + initQueryMap.put("fetalPresentation", "胎先露");
  363 + initQueryMap.put("perinealCondition", "会阴情况");
  364 + initQueryMap.put("operationCause", "手术原因");
  365 + initQueryMap.put("needleNum", "缝线针数");
  366 + initQueryMap.put("prodprocessOne", "第一产程");
  367 + initQueryMap.put("prodprocessTwo", "第二产程");
  368 + initQueryMap.put("prodprocessThree", "第三产程");
  369 + initQueryMap.put("totalprocess", "总产程");
  370 + initQueryMap.put("deathCause", "死亡原因");
  371 + initQueryMap.put("chBpSsy1", "收缩压");
  372 + initQueryMap.put("chBpSzy1", "舒张压");
  373 + initQueryMap.put("breath", "呼吸");
  374 + initQueryMap.put("pulse", "脉搏");
  375 + initQueryMap.put("oHloseBloodL", "产后1小时失血量");
  376 + initQueryMap.put("tHloseBloodL", "产后2小时失血量");
  377 + initQueryMap.put("rHloseBloodL", "产后24小时内失血量");
  378 + initQueryMap.put("loseBloodCause", "失血原因");
  379 + initQueryMap.put("tpmcType", "胎盘娩出方式");
  380 + initQueryMap.put("tpSize", "胎盘大小");
  381 + initQueryMap.put("tpWeight", "胎盘重量");
  382 + initQueryMap.put("umbilicalCordLength", "脐带长度");
  383 + initQueryMap.put("umbilicalCordEx", "脐带是否异常");
  384 + initQueryMap.put("umbilicalCordExType", "脐带异常类型");
  385 + initQueryMap.put("pregnancyOut", "妊娠结局");
  386 + initQueryMap.put("sex", "儿童性别");
  387 + initQueryMap.put("babyWeight", "儿童体重");
  388 + initQueryMap.put("babyHeight", "儿童身长");
  389 + initQueryMap.put("apgarScorePf1", "Apgar1分钟");
  390 + initQueryMap.put("apgarScorePf5", "Apgar5分钟");
  391 + initQueryMap.put("apgarScorePf10", "Apgar10分钟");
  392 + initQueryMap.put("asphyxiaM", "窒息分钟数");
  393 + initQueryMap.put("babyHealthy", "新生儿疾病");
  394 + initQueryMap.put("malformation", "畸形");
  395 + initQueryMap.put("vcCardNo", "卡号");
  396 + initQueryMap.put("fileCode", "住院号（暂时塞的档案编号）");
  397 + initQueryMap.put("fmHospital", "分娩机构");
  398 + this.initQueryMap = initQueryMap;
328 399 }
329 400 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ 24b8081
... ... @@ -387,8 +387,9 @@
387 387 /**
388 388 * @auther HuJiaqi
389 389 * @createTime 2016年12月09日 16时01分
390   - * @discription 住院号
  390 + * @discription 住院号（暂时塞的档案编号）
391 391 */
  392 + private String fileCode;
392 393  
393 394 /**
394 395 * @auther HuJiaqi
... ... @@ -837,6 +838,14 @@
837 838  
838 839 public void setAddress(String address) {
839 840 this.address = address;
  841 + }
  842 +
  843 + public String getFileCode() {
  844 + return fileCode;
  845 + }
  846 +
  847 + public void setFileCode(String fileCode) {
  848 + this.fileCode = fileCode;
840 849 }
841 850 }