Commit 7dfd26ac62adffc7990649eb67cd13f93326d504
1 parent
9056aee45a
Exists in
master
and in
7 other branches
出院小结bug
Showing 2 changed files with 35 additions and 0 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
7dfd26a
... | ... | @@ -111,10 +111,20 @@ |
111 | 111 | //0 隐藏 1 显示 |
112 | 112 | private String enable="1"; |
113 | 113 | |
114 | + private String notEnable; | |
115 | + | |
114 | 116 | private Boolean extEnable; |
115 | 117 | //区域来源 |
116 | 118 | private String source; |
117 | 119 | |
120 | + public String getNotEnable() { | |
121 | + return notEnable; | |
122 | + } | |
123 | + | |
124 | + public void setNotEnable(String notEnable) { | |
125 | + this.notEnable = notEnable; | |
126 | + } | |
127 | + | |
118 | 128 | public String getSource() { |
119 | 129 | return source; |
120 | 130 | } |
... | ... | @@ -1026,6 +1036,9 @@ |
1026 | 1036 | condition = condition.and("expVip", expVip, MongoOper.IS); |
1027 | 1037 | } |
1028 | 1038 | |
1039 | + if (null != notEnable) { | |
1040 | + condition = condition.and("enable", notEnable, MongoOper.NE); | |
1041 | + } | |
1029 | 1042 | |
1030 | 1043 | if (null != orServiceStatus && orServiceStatus.length > 1) { |
1031 | 1044 | condition = condition.and("serviceStatus", Arrays.asList(orServiceStatus), MongoOper.IN); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
View file @
7dfd26a
... | ... | @@ -130,6 +130,13 @@ |
130 | 130 | } |
131 | 131 | Patients patients = patientsList.get(patientsList.size() - 1); |
132 | 132 | |
133 | + if (new Integer(1).equals(patients.getDueStatus())) { | |
134 | + // 终止妊娠不能进行出院小结 | |
135 | + dischargeAbstractQueryResult.setStatus("5"); | |
136 | + dischargeAbstractQueryResult.setErrormsg("终止妊娠不能进行出院小结"); | |
137 | + return dischargeAbstractQueryResult; | |
138 | + } | |
139 | + | |
133 | 140 | if (patients.getType() == 1) { |
134 | 141 | // 如果是孕妇直接抛出,产妇才查询是否做过出院小结 |
135 | 142 | dischargeAbstractQueryResult.setStatus("1"); |
... | ... | @@ -140,6 +147,21 @@ |
140 | 147 | if (patients.getType() == 3 && new Integer(0).equals(patients.getBuildType())) { |
141 | 148 | dischargeAbstractQueryResult.setStatus("4"); |
142 | 149 | dischargeAbstractQueryResult.setErrormsg("未已录入分娩信息不可进行出院小结"); |
150 | + return dischargeAbstractQueryResult; | |
151 | + } | |
152 | + | |
153 | + String hospitalId; | |
154 | + try { | |
155 | + hospitalId = autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()); | |
156 | + } catch (Exception e) { | |
157 | + dischargeAbstractQueryResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
158 | + dischargeAbstractQueryResult.setErrormsg("获取获取当前医院异常"); | |
159 | + return dischargeAbstractQueryResult; | |
160 | + } | |
161 | + | |
162 | + if (!hospitalId.equals(patients.getFmHospital())) { | |
163 | + dischargeAbstractQueryResult.setStatus("6"); | |
164 | + dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结"); | |
143 | 165 | return dischargeAbstractQueryResult; |
144 | 166 | } |
145 | 167 |