shiyang / regional-platform

Download as
Browse Code »

Commit e3870845742b21f8bd1454d8d7ebca705f27c686

Authored by jiangjiazhi
1 parent 983c8e97c2
Exists in master and in 1 other branch nobuildprocess

修改报空指针问题

Showing 1 changed file with 71 additions and 71 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ e387084
... ... @@ -37,7 +37,7 @@
37 37  
38 38 /**
39 39 * 产筛门面
40   - * <p>
  40 + * <p/>
41 41 * Created by Administrator on 2016/6/30 0030.
42 42 */
43 43 @Component
44 44  
45 45  
46 46  
... ... @@ -62,23 +62,23 @@
62 62 * @param sieveAddRequest
63 63 * @return
64 64 */
65   - public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest,Integer userId) {
66   - SieveResultModel sieveResultModel =sieveAddRequest.convertToDataModel();
67   - if(StringUtils.isNotEmpty(sieveAddRequest.getId())){
68   - SieveResultQuery sieveResultQuery=new SieveResultQuery();
  65 + public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest, Integer userId) {
  66 + SieveResultModel sieveResultModel = sieveAddRequest.convertToDataModel();
  67 + if (StringUtils.isNotEmpty(sieveAddRequest.getId())) {
  68 + SieveResultQuery sieveResultQuery = new SieveResultQuery();
69 69 sieveResultQuery.setId(sieveAddRequest.getId());
70   - sieveService.update(sieveResultQuery.convertToQuery(),sieveResultModel);
71   - }else{
  70 + sieveService.update(sieveResultQuery.convertToQuery(), sieveResultModel);
  71 + } else {
72 72 sieveService.addSieve(sieveResultModel);
73 73 }
74 74  
75   - SieveQuery sieveQuery=new SieveQuery();
  75 + SieveQuery sieveQuery = new SieveQuery();
76 76 sieveQuery.setParentId(sieveAddRequest.getParentId());
77 77 sieveQuery.setYn(YnEnums.YES.getId());
78 78 String hospitalId = autoMatchFacade.getHospitalId(userId);
79 79 sieveQuery.setHospitalId(hospitalId);
80 80 List<SieveModel> list = sieveService.queryList(sieveQuery);
81   - SieveModel sieveModel=new SieveModel();
  81 + SieveModel sieveModel = new SieveModel();
82 82 sieveModel.setStatus(3);
83 83 sieveModel.setId(list.get(0).getId());
84 84 sieveModel.setHospitalId(hospitalId);
85 85  
86 86  
87 87  
88 88  
89 89  
90 90  
91 91  
92 92  
... ... @@ -86,40 +86,42 @@
86 86 sieveService.updateOneChanQianDiaSieve(sieveModel);
87 87 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
88 88 }
  89 +
89 90 //产筛结果
90   - public BaseResponse getOneSieve(String parentId){
91   - SieveResultQuery sieveResultQuery=new SieveResultQuery();
  91 + public BaseResponse getOneSieve(String parentId) {
  92 + SieveResultQuery sieveResultQuery = new SieveResultQuery();
92 93 sieveResultQuery.setParentId(parentId);
93   - List<SieveResultModel> sb= sieveService.queryListSieveResult(sieveResultQuery);
94   - SieveResult sieveResult=new SieveResult();
95   - if(CollectionUtils.isNotEmpty(sb)){
96   - SieveResultModel sieveResultModel=sb.get(0);
  94 + List<SieveResultModel> sb = sieveService.queryListSieveResult(sieveResultQuery);
  95 + SieveResult sieveResult = new SieveResult();
  96 + if (CollectionUtils.isNotEmpty(sb)) {
  97 + SieveResultModel sieveResultModel = sb.get(0);
97 98 // Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId());
98 99 sieveResult.convert(sieveResultModel, null);
99 100 }
100 101 return new BaseObjectResponse().setData(sieveResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
101 102 }
  103 +
102 104 //产前诊断结果
103   - public BaseResponse getOneChanQianDiaSieve(String id){
104   - SieveQuery sieveQuery=new SieveQuery();
  105 + public BaseResponse getOneChanQianDiaSieve(String id) {
  106 + SieveQuery sieveQuery = new SieveQuery();
105 107 sieveQuery.setYn(YnEnums.YES.getId());
106 108 sieveQuery.setId(id);
107   - List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
108   - SieveDetailResult sieveDetailResult=new SieveDetailResult();
  109 + List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
  110 + SieveDetailResult sieveDetailResult = new SieveDetailResult();
109 111  
110   - if(CollectionUtils.isNotEmpty(sieveModels)){
111   - SieveModel sieveModel= sieveModels.get(0);
  112 + if (CollectionUtils.isNotEmpty(sieveModels)) {
  113 + SieveModel sieveModel = sieveModels.get(0);
112 114 // Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
113 115 sieveDetailResult.convert(sieveModel);
114   - java.util.Map<String,String> map = new HashMap<>();
115   - String diaUnit= sieveModel.getDiaUnit();
116   - map.put("id","-1");
117   - map.put("name",diaUnit);
118   - if(StringUtils.isNotEmpty(diaUnit)&&NumberUtils.isNumber(diaUnit)){
  116 + java.util.Map<String, String> map = new HashMap<>();
  117 + String diaUnit = sieveModel.getDiaUnit();
  118 + map.put("id", "-1");
  119 + map.put("name", diaUnit);
  120 + if (StringUtils.isNotEmpty(diaUnit) && NumberUtils.isNumber(diaUnit)) {
119 121 Organization organization = organizationService.getOrganization(Integer.valueOf(diaUnit));
120   - if(null!=organization){
121   - map.put("id",organization.getId()+"");
122   - map.put("name",organization.getName());
  122 + if (null != organization) {
  123 + map.put("id", organization.getId() + "");
  124 + map.put("name", organization.getName());
123 125 }
124 126 }
125 127  
126 128  
127 129  
128 130  
129 131  
130 132  
... ... @@ -127,22 +129,24 @@
127 129 }
128 130 return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
129 131 }
130   - public BaseResponse getCheckItem(String id,Integer userId) {
  132 +
  133 + public BaseResponse getCheckItem(String id, Integer userId) {
131 134 SieveApplyOrderQuery sieveQuery = new SieveApplyOrderQuery();
132 135 sieveQuery.setYn(YnEnums.YES.getId());
133 136 sieveQuery.setParentId(id);
134   - String hospital = autoMatchFacade.getHospitalId(userId);
  137 + String hospital = autoMatchFacade.getHospitalId(userId);
135 138 sieveQuery.setHospitalId(hospital);
136   - List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveQuery);
137   - List list = new ArrayList();
138   - if(CollectionUtils.isNotEmpty(applyOrderModels)) {
  139 + List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveQuery);
  140 + List list = new ArrayList();
  141 + if (CollectionUtils.isNotEmpty(applyOrderModels)) {
139 142 SieveApplyOrderModel sieveModel = applyOrderModels.get(0);
140   - if(StringUtils.isNotEmpty(sieveModel.getCheckItem())){
141   - list=JsonUtil.jkstr2Obj(sieveModel.getCheckItem(), List.class) ;
  143 + if (StringUtils.isNotEmpty(sieveModel.getCheckItem())) {
  144 + list = JsonUtil.jkstr2Obj(sieveModel.getCheckItem(), List.class);
142 145 }
143 146 }
144   - return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  147 + return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
145 148 }
  149 +
146 150 /**
147 151 * 产前诊断
148 152 *
... ... @@ -169,7 +173,7 @@
169 173 * @param cqSieveQueryRequest
170 174 * @return
171 175 */
172   - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId,String needPage) {
  176 + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage) {
173 177 SieveQuery sieveQuery = new SieveQuery();
174 178 sieveQuery.setYn(YnEnums.YES.getId());
175 179 sieveQuery.setPhone(cqSieveQueryRequest.getPhone());
176 180  
177 181  
... ... @@ -178,18 +182,18 @@
178 182 sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult());
179 183 sieveQuery.setName(cqSieveQueryRequest.getName());
180 184 sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo());
181   - if(null!=cqSieveQueryRequest.getDueWeekStart()){
182   - sieveQuery.setDueWeekStart(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekStart()));
  185 + if (null != cqSieveQueryRequest.getDueWeekStart()) {
  186 + sieveQuery.setDueWeekStart(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekStart()));
183 187 }
184   - if(null!=cqSieveQueryRequest.getDueWeekEnd()){
185   - sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd())+6);
  188 + if (null != cqSieveQueryRequest.getDueWeekEnd()) {
  189 + sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6);
186 190 }
187 191 sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx());
188 192 sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify());
189 193 sieveQuery.setPage(cqSieveQueryRequest.getPage());
190 194 sieveQuery.setLimit(cqSieveQueryRequest.getLimit());
191 195 sieveQuery.setNeed(needPage);
192   - String hospitalId=autoMatchFacade.getHospitalId(userId);
  196 + String hospitalId = autoMatchFacade.getHospitalId(userId);
193 197 sieveQuery.setHospitalId(hospitalId);
194 198 //查询产筛list
195 199 List<SieveModel> list = sieveService.queryList(sieveQuery);
196 200  
197 201  
198 202  
199 203  
200 204  
201 205  
... ... @@ -197,35 +201,35 @@
197 201 if (CollectionUtils.isNotEmpty(list)) {
198 202 for (SieveModel sieveModel : list) {
199 203 SieveListResult sieveListResult = new SieveListResult();
200   - AntExQuery antExQuery=new AntExQuery();
  204 + AntExQuery antExQuery = new AntExQuery();
201 205 antExQuery.setYn(YnEnums.YES.getId());
202 206 antExQuery.setHospitalId(hospitalId);
203 207 antExQuery.setParentId(sieveModel.getParentId());
204 208 List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
205   - if(CollectionUtils.isNotEmpty(list1)){
206   - if(StringUtils.isNotEmpty(list1.get(0).getTireNumber())){
  209 + if (CollectionUtils.isNotEmpty(list1)) {
  210 + if (StringUtils.isNotEmpty(list1.get(0).getTireNumber())) {
207 211 sieveModel.setTireNumber(NumberUtils.toInt(list1.get(0).getTireNumber()));
208 212 }
209   - }else{
210   - AntExChuQuery antExChuQuery=new AntExChuQuery();
  213 + } else {
  214 + AntExChuQuery antExChuQuery = new AntExChuQuery();
211 215 antExChuQuery.setYn(YnEnums.YES.getId());
212 216 antExChuQuery.setParentId(sieveModel.getParentId());
213 217 antExChuQuery.setHospitalId(hospitalId);
214   - List<AntExChuModel> antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery);
215   - if(CollectionUtils.isNotEmpty(antExChuModels)){
216   - if(StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())){
  218 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  219 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  220 + if (StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())) {
217 221 sieveModel.setTireNumber(NumberUtils.toInt(antExChuModels.get(0).getTireNumber()));
218 222 }
219 223 }
220 224 }
221 225  
222 226 sieveListResult.convertToResult(sieveModel);
223   - Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
224   - if(null!=patients){
  227 + Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
  228 + if (null != patients) {
225 229 sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1");
226   - if(1==patients.getDueStatus())
  230 + if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
227 231 sieveListResult.setcDueWeek("终止妊娠");
228   - else if(patients.getType()==3){
  232 + else if (patients.getType() == 3) {
229 233 sieveListResult.setcDueWeek("已分娩");
230 234 }
231 235 }
232 236  
233 237  
... ... @@ -238,16 +242,14 @@
238 242 public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
239 243 try {
240 244  
241   - BaseListResponse listResponse = (BaseListResponse)queryList(cqSieveQueryRequest, id,null);
  245 + BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null);
242 246  
243 247 List<SieveListResult> list = listResponse.getData();
244   - List<Map<String,Object>> datas = new ArrayList<>();
  248 + List<Map<String, Object>> datas = new ArrayList<>();
245 249  
246   - if (CollectionUtils.isNotEmpty(list))
247   - {
248   - for (SieveListResult sive : list)
249   - {
250   - Map<String,Object> data = new HashMap<>();
  250 + if (CollectionUtils.isNotEmpty(list)) {
  251 + for (SieveListResult sive : list) {
  252 + Map<String, Object> data = new HashMap<>();
251 253 data.put("name", sive.getName());
252 254 data.put("cDueWeek", sive.getcDueWeek());
253 255 data.put("tireNumber", sive.getTireNumber());
254 256  
255 257  
256 258  
257 259  
... ... @@ -261,23 +263,21 @@
261 263 }
262 264 }
263 265 OutputStream out = response.getOutputStream();
264   - Map<String,String> cnames = new LinkedHashMap<>();
  266 + Map<String, String> cnames = new LinkedHashMap<>();
265 267 cnames.put("name", "姓名");
266   - cnames.put("cDueWeek","当前孕周");
267   - cnames.put("tireNumber","胎数");
  268 + cnames.put("cDueWeek", "当前孕周");
  269 + cnames.put("tireNumber", "胎数");
268 270 cnames.put("dueWeek", "申请孕周");
269 271 cnames.put("ztfxText", "整体风险");
270 272 cnames.put("phone", "联系方式");
271 273 cnames.put("cqStatus", "产前诊断");
272   - cnames.put("cqResult","产前诊断结果");
273   - cnames.put("renShenResult","妊娠结局");
  274 + cnames.put("cqResult", "产前诊断结果");
  275 + cnames.put("renShenResult", "妊娠结局");
274 276 response.setContentType("application/octet-stream");
275 277 response.setCharacterEncoding("UTF-8");
276   - response.setHeader("Content-Disposition", "attachment;fileName="+"childDatas.xls");
  278 + response.setHeader("Content-Disposition", "attachment;fileName=" + "childDatas.xls");
277 279 ExcelUtil.toExcel(out, datas, cnames);
278   - }
279   - catch (Exception e)
280   - {
  280 + } catch (Exception e) {
281 281  
282 282 }
283 283 }