Commit 877a64db9adfc62ae0fa2a4310e113eadd5cd6ef
1 parent
38019843b5
Exists in
master
and in
6 other branches
出生证明儿童死产信息修改
Showing 3 changed files with 70 additions and 68 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
877a64d
... | ... | @@ -6235,7 +6235,7 @@ |
6235 | 6235 | //saveCdgwOrg("F:\\承德工位\\qhdorg.xls"); |
6236 | 6236 | //babyReport("G:\\儿童膳食报告.xls"); |
6237 | 6237 | // saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); |
6238 | - //saveQhdWeight("F:\秦皇岛标准报告(1).xls"); | |
6238 | + saveQhdWeight("F:\秦皇岛标准报告(1).xls"); | |
6239 | 6239 | |
6240 | 6240 | //dietaryIntake("F:\\膳食摄入量推荐.xls"); |
6241 | 6241 |
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
View file @
877a64d
... | ... | @@ -75,9 +75,11 @@ |
75 | 75 | <if test="queryNo != null and queryNo != ''"> |
76 | 76 | and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo} |
77 | 77 | </if> |
78 | - <if test="isconceive !=null"> | |
78 | + | |
79 | + <if test="isconceive != null"> | |
79 | 80 | and f.isconceive=#{isconceive} |
80 | 81 | </if> |
82 | + | |
81 | 83 | <if test="startReceiveDate != null "> |
82 | 84 | AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]> |
83 | 85 | </if> |
... | ... | @@ -93,6 +95,7 @@ |
93 | 95 | |
94 | 96 | </where> |
95 | 97 | GROUP BY p.folvite_id |
98 | + | |
96 | 99 | <include refid="orderAndLimit"/> |
97 | 100 | </select> |
98 | 101 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
877a64d
... | ... | @@ -172,6 +172,7 @@ |
172 | 172 | |
173 | 173 | /** |
174 | 174 | * 查看信息 |
175 | + * | |
175 | 176 | * @param destModel |
176 | 177 | * @return |
177 | 178 | */ |
... | ... | @@ -206,7 +207,6 @@ |
206 | 207 | } |
207 | 208 | |
208 | 209 | |
209 | - | |
210 | 210 | public AmnioResultResult getAmnioResultView(AmniocentesisResultModel destModel) { |
211 | 211 | AmnioResultResult data = new AmnioResultResult(); |
212 | 212 | data.convertToResult(destModel); |
... | ... | @@ -5481,9 +5481,7 @@ |
5481 | 5481 | List<Organization> organizations = organizationService.queryOrganization(query); |
5482 | 5482 | if (CollectionUtils.isNotEmpty(organizations)) { |
5483 | 5483 | patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId())); |
5484 | - } | |
5485 | - else | |
5486 | - { | |
5484 | + } else { | |
5487 | 5485 | deliverMap.put("motherinfo", new ArrayList<>()); |
5488 | 5486 | return deliverMap; |
5489 | 5487 | } |
... | ... | @@ -5547,7 +5545,6 @@ |
5547 | 5545 | patientMap.put("hospital", fmHospital);//接生单位 |
5548 | 5546 | |
5549 | 5547 | |
5550 | - | |
5551 | 5548 | patientMap.put("mphone", pat.getPhone()); |
5552 | 5549 | |
5553 | 5550 | patientMap.put("mname", pat.getUsername());//母亲姓名 |
5554 | 5551 | |
5555 | 5552 | |
5556 | 5553 | |
5557 | 5554 | |
5558 | 5555 | |
5559 | 5556 | |
5560 | 5557 | |
5561 | 5558 | |
5562 | 5559 | |
5563 | 5560 | |
5564 | 5561 | |
5565 | 5562 | |
5566 | 5563 | |
5567 | 5564 | |
5568 | 5565 | |
5569 | 5566 | |
... | ... | @@ -5625,82 +5622,84 @@ |
5625 | 5622 | List<MaternalDeliverModel.Baby> babies = data.getBaby(); |
5626 | 5623 | if (CollectionUtils.isNotEmpty(babies)) { |
5627 | 5624 | for (MaternalDeliverModel.Baby baby : babies) { |
5628 | - Map<String, Object> map = new HashMap<>(); | |
5625 | + //子查询活产的 儿童信息 | |
5626 | + if ("0".equals(baby.getPregnancyOut())) { | |
5627 | + Map<String, Object> map = new HashMap<>(); | |
5628 | + //新生儿性别 | |
5629 | + map.put("babyid", baby.getId()); | |
5630 | + //新生儿主键 | |
5631 | + map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById( | |
5632 | + Integer.parseInt(baby.getBabyGender()))); | |
5629 | 5633 | |
5630 | - //新生儿性别 | |
5631 | - map.put("babyid", baby.getId()); | |
5632 | - //新生儿主键 | |
5633 | - map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById( | |
5634 | - Integer.parseInt(baby.getBabyGender()))); | |
5634 | + Integer week = 0; | |
5635 | + Integer day = 0; | |
5636 | + Map<String, Object> dueMap = data.getHandDueWeek(); | |
5637 | + if (dueMap != null && dueMap.size() > 0 && dueMap.get("week") != null && !"".equals(dueMap.get("week"))) { | |
5638 | + week = (dueMap.get("week") == null || "".equals(dueMap.get("week"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); | |
5639 | + day = (dueMap.get("day") == null || "".equals(dueMap.get("day"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); | |
5640 | + } else { | |
5641 | + Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); | |
5642 | + week = betweenDay / 7; | |
5643 | + day = betweenDay % 7; | |
5644 | + } | |
5635 | 5645 | |
5636 | - Integer week = 0; | |
5637 | - Integer day = 0; | |
5638 | - Map<String, Object> dueMap = data.getHandDueWeek(); | |
5639 | - if (dueMap != null && dueMap.size() > 0 && dueMap.get("week") != null && !"".equals(dueMap.get("week"))) { | |
5640 | - week = (dueMap.get("week") == null || "".equals(dueMap.get("week"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); | |
5641 | - day = (dueMap.get("day") == null || "".equals(dueMap.get("day"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); | |
5642 | - } else { | |
5643 | - Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); | |
5644 | - week = betweenDay / 7; | |
5645 | - day = betweenDay % 7; | |
5646 | - } | |
5646 | + Date fmDate = DateUtil.parseYMDHM(baby.getDueTime()); | |
5647 | 5647 | |
5648 | - Date fmDate = DateUtil.parseYMDHM(baby.getDueTime()); | |
5648 | + //出生孕周(周) | |
5649 | + map.put("babyweek", String.valueOf(week)); | |
5649 | 5650 | |
5650 | - //出生孕周(周) | |
5651 | - map.put("babyweek", String.valueOf(week)); | |
5651 | + map.put("babyday", String.valueOf(day)); | |
5652 | + //新生儿出生日期 | |
5653 | + map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate)); | |
5652 | 5654 | |
5653 | - map.put("babyday", String.valueOf(day)); | |
5654 | - //新生儿出生日期 | |
5655 | - map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate)); | |
5655 | + //新生儿出生日期 小时 | |
5656 | + map.put("babybirthdayhour", hh.format(fmDate)); | |
5656 | 5657 | |
5657 | - //新生儿出生日期 小时 | |
5658 | - map.put("babybirthdayhour", hh.format(fmDate)); | |
5658 | + //新生儿出生日期 分 | |
5659 | + map.put("babybirthdayminute", mm.format(fmDate)); | |
5659 | 5660 | |
5660 | - //新生儿出生日期 分 | |
5661 | - map.put("babybirthdayminute", mm.format(fmDate)); | |
5662 | 5661 | |
5662 | + if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { | |
5663 | + organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); | |
5664 | + } | |
5663 | 5665 | |
5664 | - if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { | |
5665 | - organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); | |
5666 | - } | |
5666 | + String babyprovince = ""; | |
5667 | + String babycity = ""; | |
5668 | + String babydistrict = ""; | |
5669 | + if (organization != null) { | |
5670 | + babyprovince = getBasicConfig(organization.getProvinceId()); | |
5671 | + babycity = getBasicConfig(organization.getCityId()); | |
5672 | + babydistrict = getBasicConfig(organization.getAreaId()); | |
5673 | + } | |
5667 | 5674 | |
5668 | - String babyprovince = ""; | |
5669 | - String babycity = ""; | |
5670 | - String babydistrict = ""; | |
5671 | - if (organization != null) { | |
5672 | - babyprovince = getBasicConfig(organization.getProvinceId()); | |
5673 | - babycity = getBasicConfig(organization.getCityId()); | |
5674 | - babydistrict = getBasicConfig(organization.getAreaId()); | |
5675 | - } | |
5675 | + //新生儿出生地(省) | |
5676 | + map.put("babyprovince", babyprovince); | |
5676 | 5677 | |
5677 | - //新生儿出生地(省) | |
5678 | - map.put("babyprovince", babyprovince); | |
5678 | + //新生儿出生地(市) | |
5679 | + map.put("babycity", babycity); | |
5679 | 5680 | |
5680 | - //新生儿出生地(市) | |
5681 | - map.put("babycity", babycity); | |
5681 | + //新生儿出生地(区县) | |
5682 | + map.put("babydistrict", babydistrict); | |
5682 | 5683 | |
5683 | - //新生儿出生地(区县) | |
5684 | - map.put("babydistrict", babydistrict); | |
5684 | + String babyState = ""; | |
5685 | + if (baby.getDeformity() != null && baby.getDeformity() == 1) { | |
5686 | + babyState = "差"; | |
5687 | + } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { | |
5688 | + babyState = "一般"; | |
5689 | + } else { | |
5690 | + babyState = "良好"; | |
5691 | + } | |
5685 | 5692 | |
5686 | - String babyState = ""; | |
5687 | - if (baby.getDeformity() != null && baby.getDeformity() == 1) { | |
5688 | - babyState = "差"; | |
5689 | - } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { | |
5690 | - babyState = "一般"; | |
5691 | - } else { | |
5692 | - babyState = "良好"; | |
5693 | - } | |
5693 | + //新生儿健康状态 | |
5694 | + map.put("babystate", babyState); | |
5694 | 5695 | |
5695 | - //新生儿健康状态 | |
5696 | - map.put("babystate", babyState); | |
5696 | + //新生儿体重(克) | |
5697 | + map.put("babyweight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : ""); | |
5698 | + //新生儿身长(厘米) | |
5699 | + map.put("babylength", StringUtils.isNotEmpty(baby.getBabyHeight()) ? baby.getBabyHeight() : ""); | |
5697 | 5700 | |
5698 | - //新生儿体重(克) | |
5699 | - map.put("babyweight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : ""); | |
5700 | - //新生儿身长(厘米) | |
5701 | - map.put("babylength", StringUtils.isNotEmpty(baby.getBabyHeight()) ? baby.getBabyHeight() : ""); | |
5702 | - | |
5703 | - babyList.add(map); | |
5701 | + babyList.add(map); | |
5702 | + } | |
5704 | 5703 | } |
5705 | 5704 | } |
5706 | 5705 | patientMap.put("newborninfo", babyList); |