Commit ccb6bffcc734fa9e7cf312fae6c567ff851f4730
1 parent
d1ccac321a
Exists in
dev
1:检查档案号和高危档案号是否重复
2:初诊和复诊显示档案号信息
Showing 2 changed files with 63 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
View file @
ccb6bff
... | ... | @@ -85,6 +85,23 @@ |
85 | 85 | return br; |
86 | 86 | } |
87 | 87 | |
88 | + | |
89 | + @ResponseBody | |
90 | + @RequestMapping(value = "checkHighRiskDocNo", method = RequestMethod.GET) | |
91 | + public BaseObjectResponse checkHighRiskDocNo(@RequestParam("id") String id) { | |
92 | + BaseObjectResponse br = viewFacade.findHighRiskDocNoIsDuplicate(id); | |
93 | + return br; | |
94 | + } | |
95 | + | |
96 | + | |
97 | + @ResponseBody | |
98 | + @RequestMapping(value = "checkDocNoIsReuse", method = RequestMethod.GET) | |
99 | + public BaseObjectResponse checkDocNoIsReuse(@RequestParam("id") String id) { | |
100 | + BaseObjectResponse br = viewFacade.findFileDocIsDuplicate(id); | |
101 | + return br; | |
102 | + } | |
103 | + | |
104 | + | |
88 | 105 | @RequestMapping(value = "/wx/findAntExChuData", method = RequestMethod.GET) |
89 | 106 | @ResponseBody |
90 | 107 | public BaseObjectResponse findWxAntExChuData(@RequestParam("id") String id, |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
ccb6bff
... | ... | @@ -1780,6 +1780,46 @@ |
1780 | 1780 | } |
1781 | 1781 | |
1782 | 1782 | /** |
1783 | + * 档案号是否重复查询 | |
1784 | + */ | |
1785 | + public BaseObjectResponse findFileDocIsDuplicate(String id) { | |
1786 | + BaseObjectResponse br = new BaseObjectResponse(); | |
1787 | + Patients data = patientsService.findOnePatientById(id); | |
1788 | + if (data == null || data.getYn() == YnEnums.NO.getId()) { | |
1789 | + br.setErrorcode(201); | |
1790 | + br.setErrormsg("该档案号可以使用"); | |
1791 | + return br; | |
1792 | + } | |
1793 | + | |
1794 | + if(data.getFileCode()!=null && data.getFileCode().length()>0){ | |
1795 | + br.setErrorcode(200); | |
1796 | + br.setErrormsg("该档案号已经被使用过了,请重新输入"); | |
1797 | + return br; | |
1798 | + } | |
1799 | + return br; | |
1800 | + } | |
1801 | + | |
1802 | + /** | |
1803 | + * 高危档案号是否重复查询 | |
1804 | + */ | |
1805 | + public BaseObjectResponse findHighRiskDocNoIsDuplicate(String id) { | |
1806 | + BaseObjectResponse br = new BaseObjectResponse(); | |
1807 | + Patients data = patientsService.findOnePatientById(id); | |
1808 | + if (data == null || data.getYn() == YnEnums.NO.getId()) { | |
1809 | + br.setErrorcode(201); | |
1810 | + br.setErrormsg("该高危档案号可以使用"); | |
1811 | + return br; | |
1812 | + } | |
1813 | + | |
1814 | + if(data.getHighRiskFileCode()!=null && data.getHighRiskFileCode().length()>0){ | |
1815 | + br.setErrorcode(200); | |
1816 | + br.setErrormsg("该高危档案号已经被使用过了,请重新输入"); | |
1817 | + return br; | |
1818 | + } | |
1819 | + return br; | |
1820 | + } | |
1821 | + | |
1822 | + /** | |
1783 | 1823 | * 初诊查询 |
1784 | 1824 | * |
1785 | 1825 | * @param id |
... | ... | @@ -1869,6 +1909,9 @@ |
1869 | 1909 | map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2())); |
1870 | 1910 | // map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); |
1871 | 1911 | map.put("quickenRemark", data.getQuickenRemark()); |
1912 | + map.put("daFileCode", patients.getFileCode()); | |
1913 | + map.put("highRiskFileCode", patients.getHighRiskFileCode()); | |
1914 | + map.put("IdCard", patients.getCardNo()); | |
1872 | 1915 | |
1873 | 1916 | /* 基本信息 */ |
1874 | 1917 | //孕妇基本信息 |
... | ... | @@ -3194,7 +3237,9 @@ |
3194 | 3237 | map.put("jmxspg", data.getJmxspg()); |
3195 | 3238 | map.put("jmxsScore", data.getJmxsScore()); |
3196 | 3239 | map.put("jmxsLevel", data.getJmxsLevel()); |
3197 | - | |
3240 | + map.put("daFileCode", patients.getFileCode()); | |
3241 | + map.put("highRiskFileCode", patients.getHighRiskFileCode()); | |
3242 | + map.put("IdCard", patients.getCardNo()); | |
3198 | 3243 | /** |
3199 | 3244 | * start |
3200 | 3245 | * 遵化市妇幼新增字段 |