fangcheng / regional-platform

Download as
Browse Code »

Commit 219039853e4be8e0652ce0bc54a77bedbbf39763

Authored by jiangjiazhi
1 parent 7906a805d9
Exists in master and in 1 other branch nobuildprocess

孕妇分娩后 变成产妇

Showing 4 changed files with 171 additions and 101 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 2190398
... ... @@ -13,10 +13,10 @@
13 13 import com.lyms.platform.common.utils.DateUtil;
14 14 import com.lyms.platform.common.utils.SystemConfig;
15 15 import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest;
  16 +import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
16 17 import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
17 18 import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
18 19 import com.lyms.platform.operate.web.result.ApplyOrderOutResult;
19   -import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
20 20 import com.lyms.platform.operate.web.result.BabyApplyOrderResult;
21 21 import com.lyms.platform.operate.web.result.ReferralApplyOrderResult;
22 22 import com.lyms.platform.operate.web.result.SieveApplyOrderResult;
... ... @@ -38,6 +38,9 @@
38 38 import java.util.*;
39 39  
40 40 /**
  41 + *
  42 + * 申请单门面
  43 + *
41 44 * Created by Administrator on 2016/6/15 0015.
42 45 */
43 46 @Component
44 47  
... ... @@ -68,13 +71,13 @@
68 71 * @param type 2 孕妇 1 儿童
69 72 * @return
70 73 */
71   - public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId,Integer type) {
  74 + public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId, Integer type) {
72 75 ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel();
73 76 referralApplyOrderModel.setCreated(new Date());
74 77 referralApplyOrderModel.setStatus(0);
75 78 PatientsQuery patientsQuery = new PatientsQuery();
76 79 patientsQuery.setId(referralApplyOrderModel.getParentId());
77   - if(2==type){
  80 + if (2 == type) {
78 81 //查询产妇信息
79 82 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
80 83 Patients patients = null;
81 84  
... ... @@ -90,11 +93,11 @@
90 93 referralApplyOrderModel.setPhone(patients.getPhone());
91 94 referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
92 95 }
93   - }else{
94   - BabyModel babyModel= babyService.getOneBabyById(referralApplyOrderModel.getParentId());
95   - if(null!=babyModel){
  96 + } else {
  97 + BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
  98 + if (null != babyModel) {
96 99 referralApplyOrderModel.setCardNo(babyModel.getCardNo());
97   - if(null!=babyModel.getBirth()){
  100 + if (null != babyModel.getBirth()) {
98 101 referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth()));
99 102 }
100 103 Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
101 104  
102 105  
103 106  
104 107  
105 108  
106 109  
107 110  
108 111  
... ... @@ -122,55 +125,61 @@
122 125 * @param sieveApplyOrderAddRequest
123 126 * @return
124 127 */
125   - public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest,Integer userId) {
  128 + public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) {
126 129 SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
127 130 sieveApplyOrderModel.setCreated(new Date());
128   - String hospitalId= autoMatchFacade.getHospitalId(userId);
  131 + String hospitalId = autoMatchFacade.getHospitalId(userId);
129 132 sieveApplyOrderModel.setHospitalId(hospitalId);
130   - //增加产筛
131   - applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
132 133  
133   -
134   - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
135   - sieveApplyOrderQuery.setStatus(0);
136   - sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
137   - //查询转诊申请单
138   - List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
139   - if (CollectionUtils.isNotEmpty(list)) {
140   - List<String> idList = new ArrayList<>();
141   - for (SieveApplyOrderModel orderModel : list) {
142   - if (null != orderModel.getParentId()) {
143   - Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
144   - if (null != patients) {
145   - SieveModel sieveModel = patientsService.convertToModel(patients);
146   - sieveModel.setFrom("2");
147   - sieveModel.setHospitalId(orderModel.getHospitalId());
148   - sieveService.addChanQianSieve(sieveModel);
  134 + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
  135 + sieveApplyOrderQuery1.setParentId(sieveApplyOrderAddRequest.getParentId());
  136 + sieveApplyOrderQuery1.setHospitalId(hospitalId);
  137 + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
  138 + //先查询本院是否已申请
  139 + List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
  140 + if (CollectionUtils.isEmpty(list1)) {
  141 + //增加产筛
  142 + applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
  143 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  144 + sieveApplyOrderQuery.setStatus(0);
  145 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  146 + //查询转诊申请单
  147 + List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
  148 + if (CollectionUtils.isNotEmpty(list)) {
  149 + List<String> idList = new ArrayList<>();
  150 + for (SieveApplyOrderModel orderModel : list) {
  151 + if (null != orderModel.getParentId()) {
  152 + Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
  153 + if (null != patients) {
  154 + SieveModel sieveModel = patientsService.convertToModel(patients);
  155 + sieveModel.setFrom("2");
  156 + sieveModel.setHospitalId(orderModel.getHospitalId());
  157 + sieveService.addChanQianSieve(sieveModel);
  158 + }
  159 + idList.add(orderModel.getId());
149 160 }
150   - idList.add(orderModel.getId());
151 161 }
152   - }
153   - SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
154   - sieveApplyOrderModel1.setStatus(1);
155   - for (String str : idList) {
156   - sieveApplyOrderModel1.setId(str);
157   - sieveApplyOrderModel1.setModified(new Date());
  162 + SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
158 163 sieveApplyOrderModel1.setStatus(1);
159   - applyOrderService.updateSieve(sieveApplyOrderModel1);
  164 + for (String str : idList) {
  165 + sieveApplyOrderModel1.setId(str);
  166 + sieveApplyOrderModel1.setModified(new Date());
  167 + sieveApplyOrderModel1.setStatus(1);
  168 + applyOrderService.updateSieve(sieveApplyOrderModel1);
  169 + }
160 170 }
  171 + SieveQuery sieveQuery = new SieveQuery();
  172 + sieveQuery.setYn(YnEnums.YES.getId());
  173 + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
  174 + List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
  175 + if (CollectionUtils.isNotEmpty(sieveModels)) {
  176 + SieveModel sieveModel = sieveModels.get(0);
  177 + sieveModel.setStatus(2);
  178 + int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
  179 + sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
  180 + sieveService.updateOneChanQianDiaSieve(sieveModel);
  181 + }
161 182 }
162   -
163   - SieveQuery sieveQuery=new SieveQuery();
164   - sieveQuery.setYn(YnEnums.YES.getId());
165   - sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
166   - List<SieveModel> sieveModels= sieveService.queryList(sieveQuery);
167   - if(CollectionUtils.isNotEmpty(sieveModels)){
168   - SieveModel sieveModel = sieveModels.get(0);
169   - sieveModel.setStatus(2);
170   - int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
171   - sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
172   - sieveService.updateOneChanQianDiaSieve(sieveModel);
173   - }
174 183 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
175 184 }
176 185  
177 186  
... ... @@ -187,15 +196,16 @@
187 196 ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult();
188 197 if (CollectionUtils.isNotEmpty(list)) {
189 198 Patients patients = patientsService.findOnePatientById(list.get(0).getParentId());
190   - String zhuanchu =list.get(0).getOutHospitalId();
191   - Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
192   - String zhuanCName=""; String zhuanRname="";
193   - if(null!=zhuanc){
194   - zhuanCName= zhuanc.getName();
  199 + String zhuanchu = list.get(0).getOutHospitalId();
  200 + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  201 + String zhuanCName = "";
  202 + String zhuanRname = "";
  203 + if (null != zhuanc) {
  204 + zhuanCName = zhuanc.getName();
195 205 }
196   - Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
197   - if(null!=zhuanc1){
198   - zhuanRname =zhuanc1.getName();
  206 + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  207 + if (null != zhuanc1) {
  208 + zhuanRname = zhuanc1.getName();
199 209 }
200 210 referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
201 211 }
202 212  
203 213  
204 214  
... ... @@ -222,14 +232,14 @@
222 232 }
223 233 return new BaseObjectResponse().setData(sieveApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
224 234 }
  235 +
225 236 /**
226 237 * 查询儿童的转诊申请
227   - *
228 238 */
229   - public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId){
230   - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
  239 + public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) {
  240 + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
231 241 referralApplyOrderQuery.setType(1);
232   - List<BabyApplyOrderResult> babyApplyOrderResults=new ArrayList<>();
  242 + List<BabyApplyOrderResult> babyApplyOrderResults = new ArrayList<>();
233 243 referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
234 244 referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
235 245 //1 转入 0转出
236 246  
237 247  
238 248  
239 249  
... ... @@ -246,27 +256,29 @@
246 256 }
247 257  
248 258 List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
249   - if(CollectionUtils.isNotEmpty(orderModels)){
250   - for(ReferralApplyOrderModel applyOrderModel:orderModels){
251   - BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult();
  259 + if (CollectionUtils.isNotEmpty(orderModels)) {
  260 + for (ReferralApplyOrderModel applyOrderModel : orderModels) {
  261 + BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult();
252 262  
253   - String zhuanchu =applyOrderModel.getOutHospitalId();
254   - Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
255   - String zhuanCName=""; String zhuanRname="";
256   - if(null!=zhuanc){
257   - zhuanCName= zhuanc.getName();
  263 + String zhuanchu = applyOrderModel.getOutHospitalId();
  264 + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  265 + String zhuanCName = "";
  266 + String zhuanRname = "";
  267 + if (null != zhuanc) {
  268 + zhuanCName = zhuanc.getName();
258 269 }
259   - Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
260   - if(null!=zhuanc1){
261   - zhuanRname =zhuanc1.getName();
  270 + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  271 + if (null != zhuanc1) {
  272 + zhuanRname = zhuanc1.getName();
262 273 }
263 274  
264   - babyApplyOrderResult.convert(applyOrderModel,zhuanCName,zhuanRname);
  275 + babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
265 276 babyApplyOrderResults.add(babyApplyOrderResult);
266 277 }
267 278 }
268 279 return new BaseListResponse().setData(babyApplyOrderResults).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
269 280 }
  281 +
270 282 /**
271 283 * 高危转诊列表
272 284 *
273 285  
... ... @@ -277,9 +289,12 @@
277 289 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
278 290 referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
279 291 referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge());
280   - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getDueWeekStart())){
281   - referralApplyOrderQuery.setDueDateStart(DateUtil.parseYMD(applyOrderQueryRequest.getDueWeekStart()));
  292 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getStartDueWeek())) {
  293 + referralApplyOrderQuery.setDueDateStart(DateUtil.parseYMD(applyOrderQueryRequest.getStartDueWeek()));
282 294 }
  295 + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getEndDueWeek())) {
  296 + referralApplyOrderQuery.setDueDateEnd(DateUtil.parseYMD(applyOrderQueryRequest.getEndDueWeek()));
  297 + }
283 298 referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor());
284 299 referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel());
285 300 referralApplyOrderQuery.setScore(applyOrderQueryRequest.getScore());
286 301  
287 302  
288 303  
... ... @@ -307,20 +322,21 @@
307 322 if (CollectionUtils.isNotEmpty(orderModels)) {
308 323 for (ReferralApplyOrderModel orderModel : orderModels) {
309 324 ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult();
310   - String zhuanchu =orderModel.getOutHospitalId();
311   - Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
312   - String zhuanCName=""; String zhuanRname="";
313   - if(null!=zhuanc){
314   - zhuanCName= zhuanc.getName();
  325 + String zhuanchu = orderModel.getOutHospitalId();
  326 + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  327 + String zhuanCName = "";
  328 + String zhuanRname = "";
  329 + if (null != zhuanc) {
  330 + zhuanCName = zhuanc.getName();
315 331 }
316   - Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
317   - if(null!=zhuanc1){
318   - zhuanRname =zhuanc1.getName();
  332 + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu));
  333 + if (null != zhuanc1) {
  334 + zhuanRname = zhuanc1.getName();
319 335 }
320 336 applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
321   - if(NumberUtils.isNumber(orderModel.getApplyDoctor())){
  337 + if (NumberUtils.isNumber(orderModel.getApplyDoctor())) {
322 338 Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor()));
323   - if(null!=users){
  339 + if (null != users) {
324 340 applyOrderResult.setApplyDoctor(users.getName());
325 341 }
326 342 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 2190398
... ... @@ -205,6 +205,8 @@
205 205 if (null != riskPatientsQueryRequest.getServiceType()) {
206 206 patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
207 207 }
  208 + patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart());
  209 + patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd());
208 210 patientsQuery.setAge(riskPatientsQueryRequest.getAge());
209 211 patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
210 212 patientsQuery.setPage(riskPatientsQueryRequest.getPage());
... ... @@ -213,6 +215,7 @@
213 215 patientsQuery.setYn(YnEnums.YES.getId());
214 216 patientsQuery.setBuildType(1);
215 217 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
  218 + patientsQuery.setNeed("1");
216 219 //查询符合条件的孕妇
217 220 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
218 221 List data = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java View file @ 2190398
... ... @@ -31,9 +31,9 @@
31 31 //年龄
32 32 private String age;
33 33 //孕周
34   - private String dueWeekStart;
  34 + private String startDueWeek;
35 35  
36   - private String getDueWeekEnd;
  36 + private String endDueWeek;
37 37  
38 38 //风险等级
39 39 private String rLevel;
40 40  
41 41  
42 42  
... ... @@ -88,20 +88,21 @@
88 88 this.age = age;
89 89 }
90 90  
91   - public String getDueWeekStart() {
92   - return dueWeekStart;
  91 +
  92 + public String getEndDueWeek() {
  93 + return endDueWeek;
93 94 }
94 95  
95   - public void setDueWeekStart(String dueWeekStart) {
96   - this.dueWeekStart = dueWeekStart;
  96 + public void setEndDueWeek(String endDueWeek) {
  97 + this.endDueWeek = endDueWeek;
97 98 }
98 99  
99   - public String getGetDueWeekEnd() {
100   - return getDueWeekEnd;
  100 + public String getStartDueWeek() {
  101 + return startDueWeek;
101 102 }
102 103  
103   - public void setGetDueWeekEnd(String getDueWeekEnd) {
104   - this.getDueWeekEnd = getDueWeekEnd;
  104 + public void setStartDueWeek(String startDueWeek) {
  105 + this.startDueWeek = startDueWeek;
105 106 }
106 107  
107 108 public String getRiskFactor() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 2190398
1 1 package com.lyms.platform.operate.web.request;
2 2  
3   -import com.lyms.platform.common.core.annotation.form.FormParam;
4 3 import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.common.core.annotation.form.FormParam;
  5 +import com.lyms.platform.common.utils.DateUtil;
  6 +import org.apache.commons.lang.math.NumberUtils;
  7 +
  8 +import java.util.Date;
  9 +
5 10 /**
6 11 * 高危孕妇管理查询
7 12 * <p>
... ... @@ -20,7 +25,12 @@
20 25 private String serviceType;
21 26 //孕周
22 27 @FormParam
23   - private String dueWeek;
  28 + private String startDueWeek;
  29 +
  30 + private int start;
  31 + private int end;
  32 + @FormParam
  33 + private String endDueWeek;
24 34 //年龄
25 35 @FormParam
26 36 private Integer age;
... ... @@ -46,6 +56,48 @@
46 56 @FormParam
47 57 private Integer expVip;
48 58  
  59 + public Date capStart() {
  60 + if (null != startDueWeek) {
  61 + start = NumberUtils.toInt(startDueWeek, 0);
  62 + Date endDate = DateUtil.addDay(new Date(), -(start*7));
  63 + return endDate;
  64 + }
  65 + return null;
  66 + }
  67 +
  68 + public Date capEnd() {
  69 + if (null != endDueWeek) {
  70 + end = NumberUtils.toInt(endDueWeek, 0);
  71 + Date endDate = DateUtil.addDay(new Date(), -(end*7));
  72 + return endDate;
  73 + }
  74 + return null;
  75 + }
  76 +
  77 + public String getEndDueWeek() {
  78 + return endDueWeek;
  79 + }
  80 +
  81 + public int getEnd() {
  82 + return end;
  83 + }
  84 +
  85 + public void setEnd(int end) {
  86 + this.end = end;
  87 + }
  88 +
  89 + public int getStart() {
  90 + return start;
  91 + }
  92 +
  93 + public void setStart(int start) {
  94 + this.start = start;
  95 + }
  96 +
  97 + public void setEndDueWeek(String endDueWeek) {
  98 + this.endDueWeek = endDueWeek;
  99 + }
  100 +
49 101 public Integer getExpVip() {
50 102 return expVip;
51 103 }
52 104  
53 105  
... ... @@ -94,15 +146,13 @@
94 146 this.cTime = cTime;
95 147 }
96 148  
97   - public String getDueWeek() {
98   - return dueWeek;
  149 + public String getStartDueWeek() {
  150 + return startDueWeek;
99 151 }
100 152  
101   - public void setDueWeek(String dueWeek) {
102   - this.dueWeek = dueWeek;
  153 + public void setStartDueWeek(String startDueWeek) {
  154 + this.startDueWeek = startDueWeek;
103 155 }
104   -
105   -
106 156  
107 157 public String getName() {
108 158 return name;