Commit 175aeba695b8f42c887b54eaa98701b86db75a20
1 parent
274e151dc3
Exists in
master
and in
2 other branches
波妞录入产检调试修改
Showing 1 changed file with 28 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
175aeba
| ... | ... | @@ -1764,7 +1764,14 @@ |
| 1764 | 1764 | WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel(); |
| 1765 | 1765 | boolean falg = true; |
| 1766 | 1766 | if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) { |
| 1767 | - if (isOpenAutoSaveAntenatal(hospitalId) && !"216".equals(hospitalId)) { | |
| 1767 | + if (isOpenAutoSaveAntenatal(hospitalId)) { | |
| 1768 | + List<String> fhrList = new ArrayList<>(); | |
| 1769 | + if(StringUtils.isNotEmpty(fhr)) { | |
| 1770 | + String[] split = fhr.split(","); | |
| 1771 | + for (String s : split) { | |
| 1772 | + fhrList.add(s); | |
| 1773 | + } | |
| 1774 | + } | |
| 1768 | 1775 | System.out.println("inputWxData enter 1"); |
| 1769 | 1776 | List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid)), AntenatalExaminationModel.class); |
| 1770 | 1777 | if (CollectionUtils.isNotEmpty(examinationModel)) { |
| 1771 | 1778 | |
| ... | ... | @@ -1775,10 +1782,11 @@ |
| 1775 | 1782 | model.setGongGao(fuh); |
| 1776 | 1783 | model.setAbdominalCircumference(abdominalGirth); |
| 1777 | 1784 | model.setSieveType(sieveType); |
| 1778 | - List<String> list = JsonUtil.jkstr2Obj(fhr, List.class); | |
| 1779 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 1785 | + | |
| 1786 | + | |
| 1787 | + if (CollectionUtils.isNotEmpty(fhrList)) { | |
| 1780 | 1788 | List<Map> placentaList = new ArrayList<>(); |
| 1781 | - for (String l : list) { | |
| 1789 | + for (String l : fhrList) { | |
| 1782 | 1790 | if (StringUtils.isEmpty(l)) { |
| 1783 | 1791 | continue; |
| 1784 | 1792 | } |
| 1785 | 1793 | |
| 1786 | 1794 | |
| ... | ... | @@ -1788,12 +1796,19 @@ |
| 1788 | 1796 | } |
| 1789 | 1797 | model.setTireData(placentaList); |
| 1790 | 1798 | |
| 1791 | - model.setTireNumber(list.size() + ""); | |
| 1799 | + model.setTireNumber(fhrList.size() + ""); | |
| 1792 | 1800 | } |
| 1801 | + | |
| 1802 | + | |
| 1793 | 1803 | model.setCheckDoctor(doctorId); |
| 1794 | 1804 | model.setEdema(edema); |
| 1795 | 1805 | if(StringUtils.isNotEmpty(riskFactor)){ |
| 1796 | - model.setRiskFactor(JsonUtil.array2JsonString(riskFactor)); | |
| 1806 | + String[] split = riskFactor.split(","); | |
| 1807 | + List<String> list = new ArrayList<>(); | |
| 1808 | + for(String s : split){ | |
| 1809 | + list.add(s); | |
| 1810 | + } | |
| 1811 | + model.setRiskFactor(JsonUtil.array2JsonString(list)); | |
| 1797 | 1812 | } |
| 1798 | 1813 | antenatalExaminationService.updateOneAnt(model, model.getId()); |
| 1799 | 1814 | |
| 1800 | 1815 | |
| ... | ... | @@ -1891,10 +1906,13 @@ |
| 1891 | 1906 | |
| 1892 | 1907 | antExAddRequest.setGongGao(fuh); |
| 1893 | 1908 | antExAddRequest.setAbdominalCircumference(abdominalGirth); |
| 1894 | - List<String> list = JsonUtil.jkstr2Obj(fhr, List.class); | |
| 1895 | - if (CollectionUtils.isNotEmpty(list)) { | |
| 1909 | + | |
| 1910 | + if (CollectionUtils.isNotEmpty(fhrList)) { | |
| 1911 | + | |
| 1912 | + | |
| 1913 | + | |
| 1896 | 1914 | List<Map> placentaList = new ArrayList<>(); |
| 1897 | - for (String l : list) { | |
| 1915 | + for (String l : fhrList) { | |
| 1898 | 1916 | if (StringUtils.isEmpty(l)) { |
| 1899 | 1917 | continue; |
| 1900 | 1918 | } |
| ... | ... | @@ -1903,7 +1921,7 @@ |
| 1903 | 1921 | placentaList.add(map); |
| 1904 | 1922 | } |
| 1905 | 1923 | antExAddRequest.setTireData(placentaList); |
| 1906 | - antExAddRequest.setTireNumber(list.size() + ""); | |
| 1924 | + antExAddRequest.setTireNumber(fhrList.size() + ""); | |
| 1907 | 1925 | antExAddRequest.setNextCheckTime(nextTime); |
| 1908 | 1926 | |
| 1909 | 1927 | GuidelinesQuery guidelinesQuery = new GuidelinesQuery(); |