jiangjiazhi / regional-platform

Download as
Browse Code »

Commit faaf4e9b54a8745bf56ad7535268ae9966ca87cd

Authored by wtt
1 parent 2e71866e29
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

母子导出

Showing 2 changed files with 28 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ faaf4e9
... ... @@ -1517,16 +1517,31 @@
1517 1517 //发放机构：当前机构名称== 当前机构名称
1518 1518 String hospitalName = couponMapper.getHospitalName(patients.getHospitalId());
1519 1519 healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName);
1520   - //镇街、村居或单位：现住地址
1521   - Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId());
1522   - healthHandbookExcelModel.setAddress(map.get("register").toString());
1523   - //孩次：分娩儿童数
1524   - AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
1525   - antExChuQuery.setParentId(patients.getId());
1526   - List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
1527 1520  
1528   - AntExChuModel data = antExService.findOne(antExChulist.get(0).getId());
1529   - healthHandbookExcelModel.setChildTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1));
  1521 + if(patients!=null && patients.getId()!=null){
  1522 + //镇街、村居或单位：现住地址
  1523 + Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId());
  1524 + healthHandbookExcelModel.setAddress(map.get("register").toString());
  1525 +
  1526 + //孩次：分娩儿童数
  1527 + AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
  1528 + antExChuQuery.setParentId(patients.getId());
  1529 + List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
  1530 + if(antExChulist!=null){
  1531 + AntExChuModel data = antExService.findOne(antExChulist.get(0).getId());
  1532 + Integer prodTime= data.getProdTime()+ 1;
  1533 + healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : prodTime.toString()));
  1534 + }else {
  1535 + healthHandbookExcelModel.setChildTime("");
  1536 + }
  1537 + }else{
  1538 + healthHandbookExcelModel.setAddress("");
  1539 + healthHandbookExcelModel.setChildTime("");
  1540 + }
  1541 +
  1542 +
  1543 +
  1544 +
1530 1545 //孕期：当前使用有孕== 有孕
1531 1546 healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation());
1532 1547 //发放日期：当前日期
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HealthHandbookExcelModel.java View file @ faaf4e9
... ... @@ -50,7 +50,7 @@
50 50 /*
51 51 孩次：分娩儿童数
52 52 */
53   - private Integer childTime;
  53 + private String childTime;
54 54 /*
55 55 孕期：当前使用有孕== 有孕
56 56 */
57 57  
... ... @@ -141,11 +141,11 @@
141 141 this.address = address;
142 142 }
143 143  
144   - public Integer getChildTime() {
  144 + public String getChildTime() {
145 145 return childTime;
146 146 }
147 147  
148   - public void setChildTime(Integer childTime) {
  148 + public void setChildTime(String childTime) {
149 149 this.childTime = childTime;
150 150 }
151 151