jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 05bf2077eed28e644055a7bd096ecdebf8e531fa

Authored by wangbo
1 parent d9b8ca18f6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产筛修改

Showing 5 changed files with 276 additions and 231 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 05bf207
... ... @@ -26,9 +26,9 @@
26 26 * 儿保检查
27 27 */
28 28 @Controller
29   -public class BabyCheckController extends BaseController{
  29 +public class BabyCheckController extends BaseController {
30 30  
31   -
  31 +
32 32 @Autowired
33 33 private BabyCheckFacade babyCheckFacade;
34 34  
35 35  
36 36  
... ... @@ -40,19 +40,19 @@
40 40  
41 41  
42 42 /**
43   - * 儿保检查添加或者修改
  43 + * 儿保检查添加或者修改
  44 + *
44 45 * @param request
45 46 * @return
46 47 */
47 48 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyCheck")
48 49 @ResponseBody
49 50 @TokenRequired
50   - public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request,HttpServletRequest httpServletRequest) {
  51 + public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request, HttpServletRequest httpServletRequest) {
51 52 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
52 53  
53 54  
54   - if (request != null && !StringUtils.isEmpty(request.getId()))
55   - {
  55 + if (request != null && !StringUtils.isEmpty(request.getId())) {
56 56 BaseResponse baseResponse = babyCheckFacade.updateBabyCheck(request, loginState.getId());
57 57 baseResponse.setObject(couponService.getPatientsInfoByCode(request.getCouponCode()));
58 58 return baseResponse;
59 59  
... ... @@ -64,13 +64,14 @@
64 64  
65 65 /**
66 66 * 删除儿保检查
  67 + *
67 68 * @param id
68 69 * @return
69 70 */
70 71 @RequestMapping(value = "/deleteBabyCheckById/{id}", method = RequestMethod.DELETE)
71 72 @ResponseBody
72 73 @TokenRequired
73   - public BaseResponse deleteBabyBuildById(@PathVariable("id")String id,HttpServletRequest request){
  74 + public BaseResponse deleteBabyBuildById(@PathVariable("id") String id, HttpServletRequest request) {
74 75 babyCheckFacade.deleteBabyCheckById(id, getUserId(request));
75 76 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
76 77 }
77 78  
78 79  
79 80  
80 81  
81 82  
82 83  
... ... @@ -78,40 +79,44 @@
78 79  
79 80 /**
80 81 * 查询儿保检查记录
  82 + *
81 83 * @param id
82 84 * @return
83 85 */
84 86 @RequestMapping(value = "/queryBabyCheckRecord/{id}", method = RequestMethod.GET)
85 87 @ResponseBody
86   - public BaseObjectResponse queryBabyCheckRecord(@PathVariable("id")String id){
87   - return babyCheckFacade.queryBabyCheckRecord(id);
  88 + public BaseObjectResponse queryBabyCheckRecord(@PathVariable("id") String id) {
  89 + return babyCheckFacade.queryBabyCheckRecord(id);
88 90 }
89 91  
90 92 /**
91 93 * 查询儿保检查记录
  94 + *
92 95 * @param id
93 96 * @return
94 97 */
95 98 @RequestMapping(value = "/queryBabyBaseInfo/{id}", method = RequestMethod.GET)
96 99 @ResponseBody
97   - public BaseObjectResponse queryBabyBaseInfo(@PathVariable("id")String id){
98   - return babyCheckFacade.queryBabyBaseInfo(id);
  100 + public BaseObjectResponse queryBabyBaseInfo(@PathVariable("id") String id) {
  101 + return babyCheckFacade.queryBabyBaseInfo(id);
99 102 }
100 103  
101 104 /**
102 105 * 查询儿保检查详情
  106 + *
103 107 * @param id
104 108 * @return
105 109 */
106 110 @RequestMapping(value = "/queryBabyCheckInfo/{id}", method = RequestMethod.GET)
107 111 @ResponseBody
108   - public BaseObjectResponse queryBabyCheckInfo(@PathVariable("id")String id){
109   - return babyCheckFacade.queryBabyCheckInfo(id);
  112 + public BaseObjectResponse queryBabyCheckInfo(@PathVariable("id") String id) {
  113 + return babyCheckFacade.queryBabyCheckInfo(id);
110 114 }
111 115  
112 116  
113 117 /**
114 118 * 查询可选择的儿童
  119 + *
115 120 * @param vcCardNo
116 121 * @param cardNo
117 122 * @return
118 123  
119 124  
120 125  
121 126  
122 127  
... ... @@ -119,33 +124,47 @@
119 124 @RequestMapping(value = "/queryChooseBabys", method = RequestMethod.GET)
120 125 @ResponseBody
121 126 @TokenRequired
122   - public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,
123   - @RequestParam(required = false)String cardNo, String coupon, @RequestParam(required = false)String ynStatus){
  127 + public BaseObjectResponse queryChooseBabys(HttpServletRequest request, @RequestParam(required = false) String vcCardNo,
  128 + @RequestParam(required = false) String cardNo, String coupon, @RequestParam(required = false) String ynStatus) {
124 129 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
125   - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon, ynStatus);
  130 + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon, ynStatus);
126 131 }
127 132  
128 133  
129 134 /**
130 135 * 删除儿保检查
  136 + *
131 137 * @param id 儿保检查Id
132 138 * @return
133 139 */
134 140 @RequestMapping(value = "/deleteBabyCheckById/{id}", method = RequestMethod.GET)
135 141 @ResponseBody
136 142 @TokenRequired
137   - public BaseResponse deleteBabyCheckById(@PathVariable("id")String id,HttpServletRequest request){
138   - babyCheckFacade.deleteBabyCheckById(id,getUserId(request));
  143 + public BaseResponse deleteBabyCheckById(@PathVariable("id") String id, HttpServletRequest request) {
  144 + babyCheckFacade.deleteBabyCheckById(id, getUserId(request));
139 145 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
140 146  
141 147 }
142 148  
143 149 /**
  150 + * 查询所有儿保检查记录
  151 + *
  152 + * @param
  153 + */
  154 + public BaseResponse list(Integer page, Integer limit) {
  155 +
  156 +
  157 + return null;
  158 + }
  159 +
  160 +
  161 + /**
144 162 * 查询身长别体重值
145   - * @param height 身长
146   - * @param weight 体重
147   - * @param sex 性别
148   - * @param birth 生日
  163 + *
  164 + * @param height 身长
  165 + * @param weight 体重
  166 + * @param sex 性别
  167 + * @param birth 生日
149 168 * @return
150 169 */
151 170 @RequestMapping(value = "/queryHWByHeight", method = RequestMethod.GET)
... ... @@ -156,7 +175,7 @@
156 175 @RequestParam(required = true) Integer sex,
157 176 @RequestParam(required = true) String birth,
158 177 @RequestParam(required = false) String dueDate,
159   - @RequestParam(required = false) String checkDate){
  178 + @RequestParam(required = false) String checkDate) {
160 179 return babyCheckFacade.queryHWByHeight(height, weight, sex, birth, dueDate, checkDate);
161 180  
162 181 }
... ... @@ -164,6 +183,7 @@
164 183  
165 184 /**
166 185 * 查询儿童的健康状态
  186 + *
167 187 * @param value
168 188 * @param sex
169 189 * @param type 0 体重 1 身长 2 头围
... ... @@ -177,7 +197,7 @@
177 197 @RequestParam(required = true) String birth,
178 198 @RequestParam(required = false) String babyId,
179 199 @RequestParam(required = false) String dueDate,
180   - @RequestParam(required = false) String checkDate){
  200 + @RequestParam(required = false) String checkDate) {
181 201 return babyCheckFacade.queryBabyHealthStatus(birth, value, sex, type, dueDate, babyId, checkDate);
182 202  
183 203 }
184 204  
185 205  
186 206  
... ... @@ -185,18 +205,19 @@
185 205  
186 206 /**
187 207 * 计算体格发育评价
  208 + *
188 209 * @param height 身长
189   - * @param sex 性别
190   - * @param birth 生日
  210 + * @param sex 性别
  211 + * @param birth 生日
191 212 * @param weight 体重
192 213 * @return
193 214 */
194 215 @RequestMapping(value = "/queryGrowthEvaluate", method = RequestMethod.GET)
195 216 @ResponseBody
196   - public BaseObjectResponse queryGrowthEvaluate(@RequestParam(required = true) Double height,@RequestParam(required = true) Integer sex
197   - ,@RequestParam(required = true) String birth,@RequestParam(required = true) Double weight,
  217 + public BaseObjectResponse queryGrowthEvaluate(@RequestParam(required = true) Double height, @RequestParam(required = true) Integer sex
  218 + , @RequestParam(required = true) String birth, @RequestParam(required = true) Double weight,
198 219 @RequestParam(required = false) String dueDate,
199   - @RequestParam(required = false) String checkDate){
  220 + @RequestParam(required = false) String checkDate) {
200 221 return babyCheckFacade.queryGrowthEvaluate(height, sex, birth, weight, dueDate, checkDate);
201 222  
202 223 }
... ... @@ -206,7 +227,7 @@
206 227 */
207 228 @RequestMapping(value = "/getBaseConfig", method = RequestMethod.GET)
208 229 @ResponseBody
209   - public BaseObjectResponse getBaseConfig(){
  230 + public BaseObjectResponse getBaseConfig() {
210 231 return babyCheckFacade.getBaseConfig();
211 232 }
212 233  
... ... @@ -217,7 +238,7 @@
217 238 @ResponseBody
218 239 public BaseObjectResponse getBabyMonthAge(
219 240 @RequestParam(required = true) String birth,
220   - @RequestParam(required = false) String checkDate){
  241 + @RequestParam(required = false) String checkDate) {
221 242 return babyCheckFacade.getBabyMonthAge(birth, checkDate);
222 243  
223 244 }
224 245  
... ... @@ -228,14 +249,15 @@
228 249 public BaseObjectResponse getHighBabyMonthAge(
229 250 @RequestParam(required = true) String babyId,
230 251 @RequestParam(required = true) String checkDate,
231   - @RequestParam(required = true) Boolean isHighRisk){
  252 + @RequestParam(required = true) Boolean isHighRisk) {
232 253 return babyCheckFacade.getHighBabyMonthAge(babyId, checkDate, isHighRisk);
233 254  
234 255 }
235 256  
236 257  
237 258 /**
238   - *儿童检查曲线图
  259 + * 儿童检查曲线图
  260 + *
239 261 * @param babyId
240 262 * @param request
241 263 * @return
... ... @@ -243,7 +265,7 @@
243 265 @RequestMapping(method = RequestMethod.GET, value = "/getBabyCurve")
244 266 @ResponseBody
245 267 @TokenRequired
246   - public BaseResponse getBabyCurve(@RequestParam(required = true) String babyId,HttpServletRequest request) {
  268 + public BaseResponse getBabyCurve(@RequestParam(required = true) String babyId, HttpServletRequest request) {
247 269 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
248 270 return babyCheckFacade.getBabyCurve(babyId, loginState.getId());
249 271 }
250 272  
... ... @@ -251,13 +273,14 @@
251 273  
252 274 /**
253 275 * 当天检查的儿童列表
  276 + *
254 277 * @param request
255 278 * @return
256 279 */
257 280 @RequestMapping("/currentCheckBabyList")
258 281 @ResponseBody
259 282 @TokenRequired
260   - public BaseObjectResponse currentCheckBabyList(HttpServletRequest request){
  283 + public BaseObjectResponse currentCheckBabyList(HttpServletRequest request) {
261 284  
262 285 return babyCheckFacade.getCurrentDayCheckBabies(getUserId(request));
263 286 }
... ... @@ -265,6 +288,7 @@
265 288  
266 289 /**
267 290 * 儿童报表
  291 + *
268 292 * @param request
269 293 * @param babyId
270 294 * @return
271 295  
... ... @@ -273,9 +297,9 @@
273 297 @ResponseBody
274 298 @TokenRequired
275 299 public BaseObjectResponse getBabyReport(HttpServletRequest request,
276   - @RequestParam(required = true) String babyId){
  300 + @RequestParam(required = true) String babyId) {
277 301  
278   - return babyCheckFacade.getBabyReport(getUserId(request),babyId);
  302 + return babyCheckFacade.getBabyReport(getUserId(request), babyId);
279 303 }
280 304  
281 305 /**
... ... @@ -286,7 +310,7 @@
286 310 */
287 311 @RequestMapping(method = RequestMethod.POST, value = "/wx/babyMeasureInfo/saveOrUpdate")
288 312 @ResponseBody
289   - public BaseResponse babyMeasureInfoSaveOrUpdate(@RequestBody WxBabyMeasureRequest param){
  313 + public BaseResponse babyMeasureInfoSaveOrUpdate(@RequestBody WxBabyMeasureRequest param) {
290 314 return babyCheckFacade.babyMeasureInfoSaveOrUpdate(param);
291 315 }
292 316  
293 317  
... ... @@ -298,12 +322,12 @@
298 322 */
299 323 @RequestMapping(method = RequestMethod.POST, value = "/wx/babyMeasureInfo/list")
300 324 @ResponseBody
301   - public BaseResponse babyMeasureInfoList(@RequestBody BaseQuery param){
  325 + public BaseResponse babyMeasureInfoList(@RequestBody BaseQuery param) {
302 326 return babyCheckFacade.babyMeasureInfoList(param);
303 327 }
304 328  
305 329 /**
306   - * 获取在儿保小程序中当天填入的最新测量信息
  330 + * 获取在儿保小程序中当天填入的最新测量信息
307 331 *
308 332 * @param param
309 333 * @return
... ... @@ -311,7 +335,7 @@
311 335 @RequestMapping(method = RequestMethod.POST, value = "/babyMeasureInfo/detail")
312 336 @TokenRequired
313 337 @ResponseBody
314   - public BaseResponse babyMeasureInfoDetail(@RequestBody BaseQuery param){
  338 + public BaseResponse babyMeasureInfoDetail(@RequestBody BaseQuery param) {
315 339 return babyCheckFacade.babyMeasureInfoDetail(param);
316 340 }
317 341  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 05bf207
... ... @@ -8,14 +8,13 @@
8 8 import com.lyms.platform.common.dao.operator.MongoOper;
9 9 import com.lyms.platform.common.dao.operator.MongoQuery;
10 10 import com.lyms.platform.common.enums.*;
11   -import com.lyms.platform.common.result.BaseListResponse;
12   -import com.lyms.platform.common.result.BaseObjectResponse;
13   -import com.lyms.platform.common.result.BaseResponse;
  11 +import com.lyms.platform.common.result.*;
14 12 import com.lyms.platform.common.utils.*;
15 13 import com.lyms.platform.operate.web.request.BabyCheckRequest;
16 14 import com.lyms.platform.operate.web.request.WxBabyMeasureRequest;
17 15 import com.lyms.platform.operate.web.result.*;
18 16 import com.lyms.platform.operate.web.service.PatientWeightService;
  17 +import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
19 18 import com.lyms.platform.operate.web.utils.MongoUtil;
20 19 import com.lyms.platform.permission.dao.master.CouponMapper;
21 20 import com.lyms.platform.permission.model.Organization;
... ... @@ -36,7 +35,7 @@
36 35 import java.util.regex.Pattern;
37 36  
38 37 @Component
39   -public class BabyCheckFacade {
  38 +public class BabyCheckFacade extends BaseServiceImpl {
40 39  
41 40 @Autowired
42 41 private BabyCheckService babyCheckService;
... ... @@ -754,6 +753,59 @@
754 753 br.setErrorcode(ErrorCodeConstants.SUCCESS);
755 754 br.setErrormsg("成功");
756 755 return br;
  756 + }
  757 +
  758 +
  759 + public BaseResponse babyCheckList(Integer page, Integer limit, Integer userId) {
  760 +
  761 +
  762 + boolean flag = true;
  763 + List<String> hospital = groupsFacade.findGroupHospital(userId, false);
  764 + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  765 + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  766 + /*if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
  767 + pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key), Criteria.where("cardID").regex(key));
  768 + flag = true;
  769 + }
  770 + if (stateWeek != null && endWeek != null) {
  771 + Date start = DateUtil.getWeekStart(endWeek);
  772 + Date end = DateUtil.getWeekEnd(stateWeek);
  773 + pCriteria.and("lastMenses").gt(start).lte(end);
  774 + flag = true;
  775 + }
  776 + if (age != null) {
  777 + Date start = DateUtil.getBeforeAge(age);
  778 + Date end = DateUtil.getBeforeAge(age + 1);
  779 + pCriteria.and("birth").gt(end).lte(start);
  780 + flag = true;
  781 + }*/
  782 + if (flag) {
  783 + List<BabyCheckModel> babyCheckModelsList = mongoTemplate.find(Query.query(pCriteria), BabyCheckModel.class);
  784 + List<String> ids = new ArrayList<>();
  785 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babyCheckModelsList)) {
  786 + for (BabyCheckModel babyCheckModel : babyCheckModelsList) {
  787 + ids.add(babyCheckModel.getId());
  788 + }
  789 + }
  790 + criteria.and("_id").in(ids);
  791 + }
  792 + PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
  793 + List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid();
  794 + List<Map> list = new ArrayList();
  795 + for (BabyCheckModel babyCheckModel : babyCheckModelList) {
  796 + Map<String, Object> map = new HashMap<>();
  797 + if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) {
  798 + /***
  799 + *儿保列表展示暂未开放
  800 + *
  801 + */
  802 +
  803 +
  804 + }
  805 + list.add(map);
  806 + }
  807 + pageResult.setGrid(list);
  808 + return RespBuilder.buildSuccess(pageResult);
757 809 }
758 810  
759 811  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 05bf207
... ... @@ -28,8 +28,6 @@
28 28 import com.lyms.platform.permission.service.OrganizationService;
29 29 import com.lyms.platform.pojo.*;
30 30 import com.lyms.platform.query.*;
31   -import com.mongodb.BasicDBObject;
32   -import com.mongodb.DBObject;
33 31 import org.apache.commons.collections.CollectionUtils;
34 32 import org.apache.commons.collections.MapUtils;
35 33 import org.apache.commons.dbutils.DbUtils;
36 34  
... ... @@ -38,12 +36,10 @@
38 36 import org.apache.commons.lang.StringUtils;
39 37 import org.springframework.beans.factory.annotation.Autowired;
40 38 import org.springframework.data.mongodb.core.MongoTemplate;
41   -import org.springframework.data.mongodb.core.query.BasicQuery;
42 39 import org.springframework.data.mongodb.core.query.Criteria;
43 40 import org.springframework.data.mongodb.core.query.Query;
44 41 import org.springframework.stereotype.Component;
45 42  
46   -import java.math.BigDecimal;
47 43 import java.sql.Connection;
48 44 import java.util.*;
49 45  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 05bf207
... ... @@ -129,8 +129,7 @@
129 129 List<SieveModel> list = sieveService.queryList(sieveQuery);
130 130  
131 131  
132   - if (CollectionUtils.isNotEmpty(list))
133   - {
  132 + if (CollectionUtils.isNotEmpty(list)) {
134 133 SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId());
135 134 sieveModel1.setStatus(3);
136 135 sieveModel1.setZtfx(sieveAddRequest.getMax());
... ... @@ -336,6 +335,13 @@
336 335 } else {
337 336 siveStatus = SieveEnums.getTitle(model.getZtfx());
338 337 }
  338 + /**
  339 + * 栾平妇幼定制
  340 + * */
  341 + if ("2100001377".equals(hospitalId)) {
  342 + siveStatus = "已产筛";
  343 + }
  344 +
339 345 } else {
340 346 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
341 347 sieveApplyOrderQuery1.setParentId(patientId);
... ... @@ -485,7 +491,7 @@
485 491 if (end > list.size()) {
486 492 end = list.size();
487 493 }
488   - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService,diagnosisService)));
  494 + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService, diagnosisService)));
489 495 }
490 496 for (Future f : listFuture) {
491 497 try {
... ... @@ -644,9 +650,7 @@
644 650 } else {
645 651 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
646 652 }
647   - }
648   - else
649   - {
  653 + } else {
650 654 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
651 655 }
652 656 }
653 657  
654 658  
... ... @@ -682,26 +686,26 @@
682 686  
683 687 //查询产前诊断
684 688 int a = 0;
685   - List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
686   - Map<String,String> map = new HashMap<String,String>();
687   - map.put("cqSieve","0");//0,未申请；1，已申请；2，已接收；3，已诊断
688   - map.put("diaProject","");
689   - map.put("diaResult","");//(0，阴性；1，阳性)
  689 + List<Map<String, String>> mList = new ArrayList<Map<String, String>>();
  690 + Map<String, String> map = new HashMap<String, String>();
  691 + map.put("cqSieve", "0");//0,未申请；1，已申请；2，已接收；3，已诊断
  692 + map.put("diaProject", "");
  693 + map.put("diaResult", "");//(0，阴性；1，阳性)
690 694 DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
691 695 diagnosisQuery.setParentId(pat.getId());
692 696 diagnosisQuery.setHospitalId(hospitalId);
693 697 List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
694   - if(CollectionUtils.isNotEmpty(diaList)){
695   - for(DiagnosisModel diagnosisModel : diaList){
696   - Map<String,String> m = new HashMap<String,String>();
697   - m.put("cqSieve",diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断
698   - m.put("diaProject",diagnosisModel.getDiaProject());
699   - m.put("diaResult",diagnosisModel.getDiaResult());//(0，阴性；1，阳性)
700   - a=1;
  698 + if (CollectionUtils.isNotEmpty(diaList)) {
  699 + for (DiagnosisModel diagnosisModel : diaList) {
  700 + Map<String, String> m = new HashMap<String, String>();
  701 + m.put("cqSieve", diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断
  702 + m.put("diaProject", diagnosisModel.getDiaProject());
  703 + m.put("diaResult", diagnosisModel.getDiaResult());//(0，阴性；1，阳性)
  704 + a = 1;
701 705 mList.add(m);
702 706 }
703 707 }
704   - if(a == 0){
  708 + if (a == 0) {
705 709 mList.add(map);
706 710 }
707 711 patientBaseResult.setDia(mList);
... ... @@ -805,8 +809,7 @@
805 809 result.put("mensesWeek", sieveApply.getMensesWeek());
806 810 result.put("experimentNum", "");
807 811  
808   - if (type == 1)
809   - {
  812 + if (type == 1) {
810 813 result.put("couponCode", couponService.findByUsedId(sieveApply.getId()));
811 814 }
812 815  
... ... @@ -1142,12 +1145,9 @@
1142 1145 ids = new ArrayList<>();
1143 1146 if (CollectionUtils.isNotEmpty(permissionsModels)) {
1144 1147 List<AddressBean> addressBeanList = JsonUtil.toList(permissionsModels.get(0).getAreaPermission(), AddressBean.class);
1145   - if (CollectionUtils.isNotEmpty(addressBeanList))
1146   - {
1147   - for (AddressBean bean : addressBeanList)
1148   - {
1149   - if (bean != null && bean.getP() != null && bean.getP().equals(cqSieveQueryRequest.getProvinceId()) && StringUtils.isNotEmpty(bean.getC()))
1150   - {
  1148 + if (CollectionUtils.isNotEmpty(addressBeanList)) {
  1149 + for (AddressBean bean : addressBeanList) {
  1150 + if (bean != null && bean.getP() != null && bean.getP().equals(cqSieveQueryRequest.getProvinceId()) && StringUtils.isNotEmpty(bean.getC())) {
1151 1151 ids.add(bean.getC());
1152 1152 }
1153 1153 }
... ... @@ -1160,12 +1160,9 @@
1160 1160 ids = new ArrayList<>();
1161 1161 if (CollectionUtils.isNotEmpty(permissionsModels)) {
1162 1162 List<AddressBean> addressBeanList = JsonUtil.toList(permissionsModels.get(0).getAreaPermission(), AddressBean.class);
1163   - if (CollectionUtils.isNotEmpty(addressBeanList))
1164   - {
1165   - for (AddressBean bean : addressBeanList)
1166   - {
1167   - if (bean != null && bean.getC() != null && bean.getC().equals(cqSieveQueryRequest.getCityId()) && StringUtils.isNotEmpty(bean.getA()))
1168   - {
  1163 + if (CollectionUtils.isNotEmpty(addressBeanList)) {
  1164 + for (AddressBean bean : addressBeanList) {
  1165 + if (bean != null && bean.getC() != null && bean.getC().equals(cqSieveQueryRequest.getCityId()) && StringUtils.isNotEmpty(bean.getA())) {
1169 1166 ids.add(bean.getA());
1170 1167 }
1171 1168 }
... ... @@ -1179,8 +1176,7 @@
1179 1176 List<String> xAxis = new ArrayList<>();
1180 1177 //获取地址列表
1181 1178 List<BasicConfig> configList = new ArrayList<>();
1182   - if (CollectionUtils.isNotEmpty(ids))
1183   - {
  1179 + if (CollectionUtils.isNotEmpty(ids)) {
1184 1180 configList = basicConfigService.queryBasicConfig(basicQuery);
1185 1181 }
1186 1182  
... ... @@ -1223,8 +1219,7 @@
1223 1219 List<Organization> orgs = organizationService.queryOrganization(idQuery);
1224 1220 List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
1225 1221  
1226   - if (CollectionUtils.isNotEmpty(hids))
1227   - {
  1222 + if (CollectionUtils.isNotEmpty(hids)) {
1228 1223 SieveQuery sieveQuery = new SieveQuery();
1229 1224 sieveQuery.setHospitalIds(hids);
1230 1225 sieveQuery.setYn(YnEnums.YES.getId());
... ... @@ -1252,9 +1247,7 @@
1252 1247 }
1253 1248 int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery);
1254 1249 dItems.add(String.valueOf(diagnosisCount));
1255   - }
1256   - else
1257   - {
  1250 + } else {
1258 1251 csItems.add("0");
1259 1252 dItems.add("0");
1260 1253 }
... ... @@ -1270,8 +1263,7 @@
1270 1263 List<List<String>> result = new ArrayList<>();
1271 1264  
1272 1265 int num = 1;
1273   - if (CollectionUtils.isNotEmpty(configList))
1274   - {
  1266 + if (CollectionUtils.isNotEmpty(configList)) {
1275 1267 for (BasicConfig c : configList) {
1276 1268  
1277 1269 List<String> items = new ArrayList<>();
... ... @@ -1292,8 +1284,7 @@
1292 1284  
1293 1285  
1294 1286 List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
1295   - if (CollectionUtils.isNotEmpty(hids))
1296   - {
  1287 + if (CollectionUtils.isNotEmpty(hids)) {
1297 1288 //应筛查人数
1298 1289 SieveQuery ySieveQuery = new SieveQuery();
1299 1290 ySieveQuery.setHospitalIds(hids);
... ... @@ -1338,9 +1329,7 @@
1338 1329 }
1339 1330 int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
1340 1331 items.add(String.valueOf(diagnosisCountAll));
1341   - }
1342   - else
1343   - {
  1332 + } else {
1344 1333 items.add("0");
1345 1334 items.add("0");
1346 1335 items.add("0");
... ... @@ -1379,9 +1368,8 @@
1379 1368 private DataPermissionService dataPermissionService;
1380 1369  
1381 1370  
1382   - private List<Map<String,String>> getSieveDatas(List<String> hospitalIds,String[] dates,String cityId,Integer userId)
1383   - {
1384   - List<Map<String,String>> list = new ArrayList<>();
  1371 + private List<Map<String, String>> getSieveDatas(List<String> hospitalIds, String[] dates, String cityId, Integer userId) {
  1372 + List<Map<String, String>> list = new ArrayList<>();
1385 1373  
1386 1374  
1387 1375 BasicConfigQuery basicQuery = new BasicConfigQuery();
... ... @@ -1396,12 +1384,9 @@
1396 1384 List<String> ids = new ArrayList<>();
1397 1385 if (CollectionUtils.isNotEmpty(permissionsModels)) {
1398 1386 List<AddressBean> addressBeanList = JsonUtil.toList(permissionsModels.get(0).getAreaPermission(), AddressBean.class);
1399   - if (CollectionUtils.isNotEmpty(addressBeanList))
1400   - {
1401   - for (AddressBean bean : addressBeanList)
1402   - {
1403   - if (bean != null && bean.getC() != null && bean.getC().equals(cityId) && StringUtils.isNotEmpty(bean.getA()))
1404   - {
  1387 + if (CollectionUtils.isNotEmpty(addressBeanList)) {
  1388 + for (AddressBean bean : addressBeanList) {
  1389 + if (bean != null && bean.getC() != null && bean.getC().equals(cityId) && StringUtils.isNotEmpty(bean.getA())) {
1405 1390 ids.add(bean.getA());
1406 1391 }
1407 1392 }
... ... @@ -1411,8 +1396,7 @@
1411 1396  
1412 1397 //获取地址列表
1413 1398 List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
1414   - for (BasicConfig bc : configList)
1415   - {
  1399 + for (BasicConfig bc : configList) {
1416 1400 int ySieveCount = 0;
1417 1401 int sSieveCount = 0;
1418 1402  
... ... @@ -1420,7 +1404,7 @@
1420 1404 int st1813Count = 0;
1421 1405 int sjqxCount = 0;
1422 1406  
1423   - int sieveCount=0;
  1407 + int sieveCount = 0;
1424 1408  
1425 1409 int disCount = 0;
1426 1410 int disExcCount = 0;
... ... @@ -1431,7 +1415,7 @@
1431 1415 int dnaSieveLowCount = 0;
1432 1416 int dnaSieveHighCount = 0;
1433 1417  
1434   - Map<String,String> mapData = new LinkedHashMap<>();
  1418 + Map<String, String> mapData = new LinkedHashMap<>();
1435 1419 mapData.put("areaName", bc.getName());//县市区
1436 1420  
1437 1421 PatientsQuery patientsQuery = new PatientsQuery();
1438 1422  
... ... @@ -1442,16 +1426,13 @@
1442 1426 patientsQuery.setType(1);
1443 1427 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
1444 1428 List<String> patientIds = new ArrayList<>();
1445   - if (CollectionUtils.isNotEmpty(patientses))
1446   - {
1447   - for (Patients pat : patientses)
1448   - {
  1429 + if (CollectionUtils.isNotEmpty(patientses)) {
  1430 + for (Patients pat : patientses) {
1449 1431 patientIds.add(pat.getId());
1450 1432 }
1451 1433 }
1452 1434  
1453   - if (CollectionUtils.isNotEmpty(patientIds))
1454   - {
  1435 + if (CollectionUtils.isNotEmpty(patientIds)) {
1455 1436  
1456 1437 SieveQuery ySieveQuery = new SieveQuery();
1457 1438 ySieveQuery.setParentIds(patientIds);
... ... @@ -1521,7 +1502,7 @@
1521 1502 sieveResultQuery.setSjgjx("2");
1522 1503 sjqxCount = sieveService.queryListSieveResultCount(sieveResultQuery);
1523 1504  
1524   - sieveCount=st21Count+st1813Count+sjqxCount;
  1505 + sieveCount = st21Count + st1813Count + sjqxCount;
1525 1506  
1526 1507  
1527 1508 //羊水穿刺产前诊断 诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
1528 1509  
1529 1510  
1530 1511  
1531 1512  
1532 1513  
1533 1514  
1534 1515  
1535 1516  
1536 1517  
... ... @@ -1554,27 +1535,27 @@
1554 1535 mapData.put("ySieveCount", String.valueOf(ySieveCount));//应筛查户籍人数
1555 1536 mapData.put("sSieveCount", String.valueOf(sSieveCount));//实筛查户籍人数
1556 1537  
1557   - mapData.put("sieveCount",String.valueOf(sieveCount));//合计
  1538 + mapData.put("sieveCount", String.valueOf(sieveCount));//合计
1558 1539  
1559 1540 mapData.put("st21Count", String.valueOf(st21Count));//21-三体
1560 1541  
1561   - mapData.put("st1813Count",String.valueOf(st1813Count));//18、13三体
  1542 + mapData.put("st1813Count", String.valueOf(st1813Count));//18、13三体
1562 1543  
1563   - mapData.put("sjqxCount",String.valueOf(sjqxCount));//神经管缺陷
  1544 + mapData.put("sjqxCount", String.valueOf(sjqxCount));//神经管缺陷
1564 1545  
1565   - mapData.put("disCount",String.valueOf(disCount));//诊断数
  1546 + mapData.put("disCount", String.valueOf(disCount));//诊断数
1566 1547  
1567   - mapData.put("disExcCount",String.valueOf(disExcCount));//异常数
  1548 + mapData.put("disExcCount", String.valueOf(disExcCount));//异常数
1568 1549  
1569   - mapData.put("sjDisCount","-");//诊断数
  1550 + mapData.put("sjDisCount", "-");//诊断数
1570 1551  
1571   - mapData.put("sjDisExcCount","-");//异常数
  1552 + mapData.put("sjDisExcCount", "-");//异常数
1572 1553  
1573   - mapData.put("dnaSieveCount","-");//筛查数
  1554 + mapData.put("dnaSieveCount", "-");//筛查数
1574 1555  
1575   - mapData.put("dnaSieveLowCount","-");//低风险人数
  1556 + mapData.put("dnaSieveLowCount", "-");//低风险人数
1576 1557  
1577   - mapData.put("dnaSieveHighCount","-");//高风险人数
  1558 + mapData.put("dnaSieveHighCount", "-");//高风险人数
1578 1559  
1579 1560 // mapData.put("sjDisCount",String.valueOf(sjDisCount));//诊断数
1580 1561  
... ... @@ -1602,7 +1583,7 @@
1602 1583 int st21Count = 0;
1603 1584 int st1813Count = 0;
1604 1585 int sjqxCount = 0;
1605   - int sieveCount=0;
  1586 + int sieveCount = 0;
1606 1587 int disCount = 0;
1607 1588 int disExcCount = 0;
1608 1589 int sjDisCount = 0;
... ... @@ -1612,10 +1593,8 @@
1612 1593 int dnaSieveLowCount = 0;
1613 1594 int dnaSieveHighCount = 0;
1614 1595  
1615   - if (CollectionUtils.isNotEmpty(list))
1616   - {
1617   - for (Map<String,String> map : list)
1618   - {
  1596 + if (CollectionUtils.isNotEmpty(list)) {
  1597 + for (Map<String, String> map : list) {
1619 1598 ySieveCount += Integer.parseInt(map.get("ySieveCount"));
1620 1599 sSieveCount += Integer.parseInt(map.get("sSieveCount"));
1621 1600 st21Count += Integer.parseInt(map.get("st21Count"));
... ... @@ -1631,21 +1610,21 @@
1631 1610 // dnaSieveHighCount += Integer.parseInt(map.get("dnaSieveHighCount"));
1632 1611 }
1633 1612 }
1634   - Map<String,String> totalMap = new LinkedHashMap<>();
1635   - totalMap.put("orgName","合计");
1636   - totalMap.put("ySieveCount",String.valueOf(ySieveCount));
1637   - totalMap.put("sSieveCount",String.valueOf(sSieveCount));
1638   - totalMap.put("sieveCount",String.valueOf(sieveCount));
1639   - totalMap.put("st21Count",String.valueOf(st21Count));
1640   - totalMap.put("st1813Count",String.valueOf(st1813Count));
1641   - totalMap.put("sjqxCount",String.valueOf(sjqxCount));
1642   - totalMap.put("disCount",String.valueOf(disCount));
1643   - totalMap.put("disExcCount",String.valueOf(disExcCount));
1644   - totalMap.put("sjDisCount","-");
1645   - totalMap.put("sjDisExcCount","-");
1646   - totalMap.put("dnaSieveCount","-");
1647   - totalMap.put("dnaSieveLowCount","-");
1648   - totalMap.put("dnaSieveHighCount","-");
  1613 + Map<String, String> totalMap = new LinkedHashMap<>();
  1614 + totalMap.put("orgName", "合计");
  1615 + totalMap.put("ySieveCount", String.valueOf(ySieveCount));
  1616 + totalMap.put("sSieveCount", String.valueOf(sSieveCount));
  1617 + totalMap.put("sieveCount", String.valueOf(sieveCount));
  1618 + totalMap.put("st21Count", String.valueOf(st21Count));
  1619 + totalMap.put("st1813Count", String.valueOf(st1813Count));
  1620 + totalMap.put("sjqxCount", String.valueOf(sjqxCount));
  1621 + totalMap.put("disCount", String.valueOf(disCount));
  1622 + totalMap.put("disExcCount", String.valueOf(disExcCount));
  1623 + totalMap.put("sjDisCount", "-");
  1624 + totalMap.put("sjDisExcCount", "-");
  1625 + totalMap.put("dnaSieveCount", "-");
  1626 + totalMap.put("dnaSieveLowCount", "-");
  1627 + totalMap.put("dnaSieveHighCount", "-");
1649 1628  
1650 1629 // totalMap.put("sjDisCount",String.valueOf(sjDisCount));
1651 1630 // totalMap.put("sjDisExcCount",String.valueOf(sjDisExcCount));
... ... @@ -1656,7 +1635,7 @@
1656 1635 list.add(totalMap);
1657 1636 }
1658 1637  
1659   - public void exportSieveReportExcl(CqSieveQueryRequest cqSieveQueryRequest, Integer userId,HttpServletResponse response) {
  1638 + public void exportSieveReportExcl(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, HttpServletResponse response) {
1660 1639  
1661 1640 try {
1662 1641 //获取用户权限医院和筛选条件的交集
1663 1642  
1664 1643  
... ... @@ -1666,13 +1645,13 @@
1666 1645 String titleName = "孕妇产前筛查和诊断情况月报表";
1667 1646 if (StringUtils.isNotEmpty(cqSieveQueryRequest.getTime())) {
1668 1647 dates = cqSieveQueryRequest.getTime().split(" - ");
1669   - titleName+=cqSieveQueryRequest.getTime();
  1648 + titleName += cqSieveQueryRequest.getTime();
1670 1649 }
1671   - List<Map<String,String>> list = getSieveDatas(currentUserHospPermissions,dates,cqSieveQueryRequest.getCityId(),userId);
  1650 + List<Map<String, String>> list = getSieveDatas(currentUserHospPermissions, dates, cqSieveQueryRequest.getCityId(), userId);
1672 1651 response.setContentType("application/force-download");
1673 1652 response.setHeader("Content-Disposition", "attachment;filename=" + new String(("孕妇产前筛查和诊断情况月报表.xls").getBytes("UTF-8"), "ISO-8859-1"));
1674   - String path = this.getClass().getResource("/").getPath()+ "whfy_sieve.xls";
1675   - ExcelUtil.writeWhSieveExclFile(path, response.getOutputStream(), list,titleName);
  1653 + String path = this.getClass().getResource("/").getPath() + "whfy_sieve.xls";
  1654 + ExcelUtil.writeWhSieveExclFile(path, response.getOutputStream(), list, titleName);
1676 1655  
1677 1656 } catch (Exception e) {
1678 1657 ExceptionUtils.catchException(e, "exportSieveReportExcl error");
1679 1658  
1680 1659  
1681 1660  
... ... @@ -1686,20 +1665,20 @@
1686 1665 Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
1687 1666  
1688 1667 String titleName = "产前诊断及新生儿疾病筛查工作情况表";
1689   - String h1 = "填报单位（签章）： "+org.getName();
  1668 + String h1 = "填报单位（签章）： " + org.getName();
1690 1669 String[] dates = null;
1691 1670 if (StringUtils.isNotEmpty(cqSieveQueryRequest.getTime())) {
1692 1671 dates = cqSieveQueryRequest.getTime().split(" - ");
1693   - h1+=" "+cqSieveQueryRequest.getTime();
  1672 + h1 += " " + cqSieveQueryRequest.getTime();
1694 1673 }
1695 1674  
1696 1675 //获取用户权限医院和筛选条件的交集
1697 1676 List<String> currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions2(userId, cqSieveQueryRequest.getProvinceId(),
1698 1677 cqSieveQueryRequest.getCityId(), cqSieveQueryRequest.getAreaId());
1699   - List<Map<String,String>> list = getDiaDatas(currentUserHospPermissions, dates);
  1678 + List<Map<String, String>> list = getDiaDatas(currentUserHospPermissions, dates);
1700 1679 response.setContentType("application/force-download");
1701 1680 response.setHeader("Content-Disposition", "attachment;filename=" + new String(("产前诊断及新生儿疾病筛查工作情况表.xls").getBytes("UTF-8"), "ISO-8859-1"));
1702   - String path = this.getClass().getResource("/").getPath()+ "whfy_diagnosis.xls";
  1681 + String path = this.getClass().getResource("/").getPath() + "whfy_diagnosis.xls";
1703 1682 ExcelUtil.writeWhDiagnosisExclFile(path, response.getOutputStream(), list, titleName, h1);
1704 1683  
1705 1684 } catch (Exception e) {
... ... @@ -1710,8 +1689,7 @@
1710 1689 private List<Map<String, String>> getDiaDatas(List<String> hospitalIds, String[] dates) {
1711 1690 List<Map<String, String>> list = new ArrayList<>();
1712 1691  
1713   - for (String hid : hospitalIds)
1714   - {
  1692 + for (String hid : hospitalIds) {
1715 1693  
1716 1694 int sieveCount = 0;
1717 1695 int st21Count = 0;
... ... @@ -1754,7 +1732,7 @@
1754 1732 int hjStopCount = 0;
1755 1733 Map<String, String> dataMap = new LinkedHashMap<>();
1756 1734  
1757   - dataMap.put("areaName",organizationService.getOrganization(Integer.parseInt(hid)).getName());
  1735 + dataMap.put("areaName", organizationService.getOrganization(Integer.parseInt(hid)).getName());
1758 1736  
1759 1737  
1760 1738 PatientsQuery patientsQuery = new PatientsQuery();
1761 1739  
... ... @@ -1763,16 +1741,13 @@
1763 1741 patientsQuery.setType(1);
1764 1742 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
1765 1743 List<String> patientIds = new ArrayList<>();
1766   - if (CollectionUtils.isNotEmpty(patientses))
1767   - {
1768   - for (Patients pat : patientses)
1769   - {
  1744 + if (CollectionUtils.isNotEmpty(patientses)) {
  1745 + for (Patients pat : patientses) {
1770 1746 patientIds.add(pat.getId());
1771 1747 }
1772 1748 }
1773 1749  
1774   - if (CollectionUtils.isNotEmpty(patientIds))
1775   - {
  1750 + if (CollectionUtils.isNotEmpty(patientIds)) {
1776 1751 //筛查孕妇数
1777 1752 SieveQuery sieveQuery1 = new SieveQuery();
1778 1753 sieveQuery1.setHospitalId(hid);
... ... @@ -1840,7 +1815,7 @@
1840 1815 sieveResultQuery.setSjgjx("2");
1841 1816 sjqxCount = sieveService.queryListSieveResultCount(sieveResultQuery);
1842 1817  
1843   - sieveExcCountAll = st21Count+st1813Count+sjqxCount;
  1818 + sieveExcCountAll = st21Count + st1813Count + sjqxCount;
1844 1819  
1845 1820  
1846 1821 //羊水穿刺产前诊断 诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测)
1847 1822  
... ... @@ -1933,39 +1908,39 @@
1933 1908 teDiaExcCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
1934 1909  
1935 1910 //合计诊断数
1936   - hjDiaCount=disCount+csDiaCount+ysDiaCount+rmDiaCount+teDiaCount+qtDiaCount;
1937   - hjDiaExcCount=disExcCount+csDiaCount+ysDiaExcCount+rmDiaExcCount+teDiaExcCount+qtDiaExcCount;
1938   - hjStopCount=disStopCount;
  1911 + hjDiaCount = disCount + csDiaCount + ysDiaCount + rmDiaCount + teDiaCount + qtDiaCount;
  1912 + hjDiaExcCount = disExcCount + csDiaCount + ysDiaExcCount + rmDiaExcCount + teDiaExcCount + qtDiaExcCount;
  1913 + hjStopCount = disStopCount;
1939 1914 }
1940 1915  
1941   - dataMap.put("sieveCount",String.valueOf(sieveCount));
1942   - dataMap.put("st21Count",String.valueOf(st21Count));
1943   - dataMap.put("st1813Count",String.valueOf(st1813Count));
1944   - dataMap.put("sjqxCount",String.valueOf(sjqxCount));
1945   - dataMap.put("sieveExcCountAll",String.valueOf(sieveExcCountAll));
1946   - dataMap.put("disCount",String.valueOf(disCount));
1947   - dataMap.put("disExcCount",String.valueOf(disExcCount));
1948   - dataMap.put("disStopCount",String.valueOf(disStopCount));
1949   - dataMap.put("csDiaCount","-");
1950   - dataMap.put("csClCount","-");
1951   - dataMap.put("csDzCount","-");
1952   - dataMap.put("csXzbCount","-");
1953   - dataMap.put("csSjgqxCount","-");
1954   - dataMap.put("csNjsCount","-");
1955   - dataMap.put("csZtdsCount","-");
1956   - dataMap.put("csQtCount","-");
1957   - dataMap.put("csJxCount","-");
1958   - dataMap.put("ysDiaCount","-");
1959   - dataMap.put("ysDiaExcCount","-");
1960   - dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
1961   - dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
1962   - dataMap.put("teDiaCount",String.valueOf(teDiaCount));
1963   - dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
1964   - dataMap.put("qtDiaCount","-");
1965   - dataMap.put("qtDiaExcCount","-");
1966   - dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
1967   - dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
1968   - dataMap.put("hjStopCount",String.valueOf(hjStopCount));
  1916 + dataMap.put("sieveCount", String.valueOf(sieveCount));
  1917 + dataMap.put("st21Count", String.valueOf(st21Count));
  1918 + dataMap.put("st1813Count", String.valueOf(st1813Count));
  1919 + dataMap.put("sjqxCount", String.valueOf(sjqxCount));
  1920 + dataMap.put("sieveExcCountAll", String.valueOf(sieveExcCountAll));
  1921 + dataMap.put("disCount", String.valueOf(disCount));
  1922 + dataMap.put("disExcCount", String.valueOf(disExcCount));
  1923 + dataMap.put("disStopCount", String.valueOf(disStopCount));
  1924 + dataMap.put("csDiaCount", "-");
  1925 + dataMap.put("csClCount", "-");
  1926 + dataMap.put("csDzCount", "-");
  1927 + dataMap.put("csXzbCount", "-");
  1928 + dataMap.put("csSjgqxCount", "-");
  1929 + dataMap.put("csNjsCount", "-");
  1930 + dataMap.put("csZtdsCount", "-");
  1931 + dataMap.put("csQtCount", "-");
  1932 + dataMap.put("csJxCount", "-");
  1933 + dataMap.put("ysDiaCount", "-");
  1934 + dataMap.put("ysDiaExcCount", "-");
  1935 + dataMap.put("rmDiaCount", String.valueOf(rmDiaCount));
  1936 + dataMap.put("rmDiaExcCount", String.valueOf(rmDiaExcCount));
  1937 + dataMap.put("teDiaCount", String.valueOf(teDiaCount));
  1938 + dataMap.put("teDiaExcCount", String.valueOf(teDiaExcCount));
  1939 + dataMap.put("qtDiaCount", "-");
  1940 + dataMap.put("qtDiaExcCount", "-");
  1941 + dataMap.put("hjDiaCount", String.valueOf(hjDiaCount));
  1942 + dataMap.put("hjDiaExcCount", String.valueOf(hjDiaExcCount));
  1943 + dataMap.put("hjStopCount", String.valueOf(hjStopCount));
1969 1944  
1970 1945 list.add(dataMap);
1971 1946  
... ... @@ -2014,10 +1989,8 @@
2014 1989 int hjStopCount = 0;
2015 1990  
2016 1991  
2017   - if (CollectionUtils.isNotEmpty(list))
2018   - {
2019   - for (Map<String,String> map : list)
2020   - {
  1992 + if (CollectionUtils.isNotEmpty(list)) {
  1993 + for (Map<String, String> map : list) {
2021 1994 sieveCount += Integer.parseInt(map.get("sieveCount"));
2022 1995 st21Count += Integer.parseInt(map.get("st21Count"));
2023 1996 st1813Count += Integer.parseInt(map.get("st1813Count"));
2024 1997  
... ... @@ -2048,28 +2021,28 @@
2048 2021 hjStopCount += Integer.parseInt(map.get("hjStopCount"));
2049 2022 }
2050 2023 }
2051   - Map<String,String> dataMap = new LinkedHashMap<>();
2052   - dataMap.put("areaName","合计");
2053   - dataMap.put("sieveCount",String.valueOf(sieveCount));
2054   - dataMap.put("st21Count",String.valueOf(st21Count));
2055   - dataMap.put("st1813Count",String.valueOf(st1813Count));
2056   - dataMap.put("sjqxCount",String.valueOf(sjqxCount));
2057   - dataMap.put("sieveExcCountAll",String.valueOf(sieveExcCountAll));
2058   - dataMap.put("disCount",String.valueOf(disCount));
2059   - dataMap.put("disExcCount",String.valueOf(disExcCount));
2060   - dataMap.put("disStopCount",String.valueOf(disStopCount));
  2024 + Map<String, String> dataMap = new LinkedHashMap<>();
  2025 + dataMap.put("areaName", "合计");
  2026 + dataMap.put("sieveCount", String.valueOf(sieveCount));
  2027 + dataMap.put("st21Count", String.valueOf(st21Count));
  2028 + dataMap.put("st1813Count", String.valueOf(st1813Count));
  2029 + dataMap.put("sjqxCount", String.valueOf(sjqxCount));
  2030 + dataMap.put("sieveExcCountAll", String.valueOf(sieveExcCountAll));
  2031 + dataMap.put("disCount", String.valueOf(disCount));
  2032 + dataMap.put("disExcCount", String.valueOf(disExcCount));
  2033 + dataMap.put("disStopCount", String.valueOf(disStopCount));
2061 2034  
2062   - dataMap.put("csDiaCount","-");
2063   - dataMap.put("csClCount","-");
2064   - dataMap.put("csDzCount","-");
2065   - dataMap.put("csXzbCount","-");
2066   - dataMap.put("csSjgqxCount","-");
2067   - dataMap.put("csNjsCount","-");
2068   - dataMap.put("csZtdsCount","-");
2069   - dataMap.put("csQtCount","-");
2070   - dataMap.put("csJxCount","-");
2071   - dataMap.put("ysDiaCount","-");
2072   - dataMap.put("ysDiaExcCount","-");
  2035 + dataMap.put("csDiaCount", "-");
  2036 + dataMap.put("csClCount", "-");
  2037 + dataMap.put("csDzCount", "-");
  2038 + dataMap.put("csXzbCount", "-");
  2039 + dataMap.put("csSjgqxCount", "-");
  2040 + dataMap.put("csNjsCount", "-");
  2041 + dataMap.put("csZtdsCount", "-");
  2042 + dataMap.put("csQtCount", "-");
  2043 + dataMap.put("csJxCount", "-");
  2044 + dataMap.put("ysDiaCount", "-");
  2045 + dataMap.put("ysDiaExcCount", "-");
2073 2046  
2074 2047 // dataMap.put("csDiaCount",String.valueOf(csDiaCount));
2075 2048 // dataMap.put("csClCount",String.valueOf(csClCount));
2076 2049  
... ... @@ -2082,17 +2055,17 @@
2082 2055 // dataMap.put("csJxCount",String.valueOf(csJxCount));
2083 2056 // dataMap.put("ysDiaCount",String.valueOf(ysDiaCount));
2084 2057 // dataMap.put("ysDiaExcCount",String.valueOf(ysDiaExcCount));
2085   - dataMap.put("rmDiaCount",String.valueOf(rmDiaCount));
2086   - dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount));
2087   - dataMap.put("teDiaCount",String.valueOf(teDiaCount));
2088   - dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount));
  2058 + dataMap.put("rmDiaCount", String.valueOf(rmDiaCount));
  2059 + dataMap.put("rmDiaExcCount", String.valueOf(rmDiaExcCount));
  2060 + dataMap.put("teDiaCount", String.valueOf(teDiaCount));
  2061 + dataMap.put("teDiaExcCount", String.valueOf(teDiaExcCount));
2089 2062 // dataMap.put("qtDiaCount",String.valueOf(qtDiaCount));
2090 2063 // dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount));
2091   - dataMap.put("qtDiaCount","-");
2092   - dataMap.put("qtDiaExcCount","-");
2093   - dataMap.put("hjDiaCount",String.valueOf(hjDiaCount));
2094   - dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount));
2095   - dataMap.put("hjStopCount",String.valueOf(hjStopCount));
  2064 + dataMap.put("qtDiaCount", "-");
  2065 + dataMap.put("qtDiaExcCount", "-");
  2066 + dataMap.put("hjDiaCount", String.valueOf(hjDiaCount));
  2067 + dataMap.put("hjDiaExcCount", String.valueOf(hjDiaExcCount));
  2068 + dataMap.put("hjStopCount", String.valueOf(hjStopCount));
2096 2069  
2097 2070 list.add(dataMap);
2098 2071 }
platform-operate-api/src/main/resources/sfdjb.docx View file @ 05bf207

No preview for this file type