jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 641cb38efcd72ca933e18367acfa95c03354c7ae

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

统计

Showing 11 changed files with 204 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 641cb38
... ... @@ -204,7 +204,11 @@
204 204 if (CollectionUtils.isNotEmpty(lisReportModels)) {
205 205 for (LisReportModel model : lisReportModels) {
206 206  
207   - wifeClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime()));
  207 + if(wifeClinicalCheck.get("fillDate") == null)
  208 + {
  209 + wifeClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime()));
  210 + }
  211 +
208 212 wifeClinicalCheck.put("doctor",2100006234);
209 213 wifeClinicalCheck.put("doctorStr","张洪英");
210 214  
... ... @@ -565,8 +569,10 @@
565 569 List<LisReportModel> hlisReportModels = getLhxfyLis(preEugenicsBaseModel.getHusbandCardNo());
566 570 if (CollectionUtils.isNotEmpty(hlisReportModels)) {
567 571 for (LisReportModel model : hlisReportModels) {
568   -
569   - husbandClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime()));
  572 + if(husbandClinicalCheck.get("fillDate") == null)
  573 + {
  574 + husbandClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime()));
  575 + }
570 576 husbandClinicalCheck.put("doctor",2100006234);
571 577 husbandClinicalCheck.put("doctorStr","张洪英");
572 578  
... ... @@ -708,11 +714,21 @@
708 714 }
709 715 }
710 716 //隆化-妇女健康管理-男女婚检lis检查结果获取
711   - autoHjInLis();
712   -
713   -
714   - //同步孕期优生得b超检查到婚检得b超检查
715   - syncYcysToHj();
  717 + try
  718 + {
  719 + autoHjInLis();
  720 + }catch (Exception e)
  721 + {
  722 + ExceptionUtils.catchException(e,"男女婚检lis检查结果获取异常");
  723 + }
  724 + try
  725 + {
  726 + //同步孕期优生得b超检查到婚检得b超检查
  727 + syncYcysToHj();
  728 + }catch (Exception e)
  729 + {
  730 + ExceptionUtils.catchException(e,"同步孕期优生得b超检查到婚检得b超检查异常");
  731 + }
716 732 }
717 733 //隆化-妇女健康管理-男女婚检lis检查结果获取
718 734 public void autoHjInLis()
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java View file @ 641cb38
... ... @@ -491,7 +491,7 @@
491 491 * @param dateTime 年月日（）
492 492 * @return
493 493 */
494   - @RequestMapping(method = RequestMethod.GET, value = "/getPublicHygieneServiceCount1")
  494 + @RequestMapping(method = RequestMethod.GET, value = "/getPublicHygieneServiceCount")
495 495 @ResponseBody
496 496 @TokenRequired
497 497 public BaseResponse getPublicHygieneServiceCount(HttpServletRequest request,
... ... @@ -506,7 +506,18 @@
506 506 }
507 507  
508 508  
509   - @RequestMapping(method = RequestMethod.GET, value = "/getPublicHygieneServiceCount")
  509 + /**
  510 + * 丰宁县定制公卫统计
  511 + * @param request
  512 + * @param provinceId
  513 + * @param cityId
  514 + * @param areaId
  515 + * @param streetId
  516 + * @param dateTime
  517 + * @param type
  518 + * @return
  519 + */
  520 + @RequestMapping(method = RequestMethod.GET, value = "/getPublicHygieneServiceCount1")
510 521 @ResponseBody
511 522 @TokenRequired
512 523 public BaseResponse getPublicHygieneServiceCount1(HttpServletRequest request,
... ... @@ -518,6 +529,32 @@
518 529 @RequestParam ( required = false) Integer type) {
519 530 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
520 531 return patientSyncMysqlFacade.getPublicHygieneServiceCount1(provinceId,cityId,areaId,streetId,dateTime,type);
  532 + }
  533 +
  534 +
  535 + /**
  536 + * 丰宁活产按照户籍地址统计
  537 + * @param request
  538 + * @param provinceId
  539 + * @param cityId
  540 + * @param areaId
  541 + * @param streetId
  542 + * @param dateTime
  543 + * @param type
  544 + * @return
  545 + */
  546 + @RequestMapping(method = RequestMethod.GET, value = "/getPublicHygieneServiceCount2")
  547 + @ResponseBody
  548 + @TokenRequired
  549 + public BaseResponse getPublicHygieneServiceCount2(HttpServletRequest request,
  550 + @RequestParam String provinceId,
  551 + @RequestParam String cityId,
  552 + @RequestParam String areaId,
  553 + @RequestParam( required = false) String streetId,
  554 + @RequestParam Date dateTime,
  555 + @RequestParam ( required = false) Integer type) {
  556 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  557 + return patientSyncMysqlFacade.getPublicHygieneServiceCount2(provinceId,cityId,areaId,streetId,dateTime,type);
521 558 }
522 559  
523 560 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 641cb38
... ... @@ -14,8 +14,7 @@
14 14 import com.lyms.platform.common.base.BaseController;
15 15 import com.lyms.platform.common.base.LoginContext;
16 16 import com.lyms.platform.common.constants.ErrorCodeConstants;
17   -import com.lyms.platform.common.enums.SieveStatusEnums;
18   -import com.lyms.platform.common.enums.YnEnums;
  17 +import com.lyms.platform.common.enums.*;
19 18 import com.lyms.platform.common.result.BaseObjectResponse;
20 19 import com.lyms.platform.common.result.BaseResponse;
21 20 import com.lyms.platform.common.utils.*;
... ... @@ -26,6 +25,7 @@
26 25 import com.lyms.platform.operate.web.result.SmnResult;
27 26 import com.lyms.platform.operate.web.service.*;
28 27 import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl;
  28 +import com.lyms.platform.operate.web.utils.CommonsHelper;
29 29 import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker;
30 30 import com.lyms.platform.operate.web.worker.AntexcOtherHighRiskWorker;
31 31 import com.lyms.platform.operate.web.worker.BabyBuildSerToPatientSerWorker;
... ... @@ -5944,7 +5944,7 @@
5944 5944 @ResponseBody
5945 5945 public void exportHandleFmData(HttpServletResponse response,String start,String end)
5946 5946 {
5947   - StringBuffer sb = new StringBuffer();
  5947 + //StringBuffer sb = new StringBuffer();
5948 5948 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
5949 5949 matDeliverQuery.setYn(YnEnums.YES.getId());
5950 5950 Date startDate1 = DateUtil.parseYMD(start);
5951 5951  
... ... @@ -5967,12 +5967,69 @@
5967 5967 {
5968 5968 patients = patientsService.findOnePatientById(patients.getSource());
5969 5969 }
5970   - data.put("coupon",patients.isSendCoupon());
  5970 + //data.put("coupon",patients.isSendCoupon());
5971 5971 data.put("name",patients.getUsername());
5972 5972 data.put("cardNo",patients.getCardNo());
5973 5973 data.put("fmDate",maternalDeliverModel.getDueDate());
5974 5974 data.put("buildDate",DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
5975 5975 data.put("buildHospital",organizationService.getOrganization(Integer.parseInt(patients.getHospitalId())).getName());
  5976 +
  5977 + data.put("fmWeek",maternalDeliverModel.getDueWeek());
  5978 + //户籍地址
  5979 + data.put("residence", CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
  5980 + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
  5981 +
  5982 + //居住地
  5983 + data.put("register", CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
  5984 + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
  5985 + data.put("fmHospital",organizationService.getOrganization(Integer.parseInt(maternalDeliverModel.getHospitalId())).getName());
  5986 + String deliveryMode = "";
  5987 + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
  5988 +
  5989 + StringBuilder sb1 = new StringBuilder();
  5990 + Map m = JsonUtil.str2Obj(maternalDeliverModel.getDeliveryMode(), Map.class);
  5991 + String fmfs = null;
  5992 + if (m != null) {
  5993 + Object b = m.get("fmfs");
  5994 + if (b != null) {
  5995 + fmfs = b.toString();
  5996 + if (fmfs != null) {
  5997 + if (fmfs.equals("1")) {
  5998 + String fmName = FmTypeEnums.getFmNameById(fmfs);
  5999 + sb1.append(fmName);
  6000 + deliveryMode = sb1.toString();
  6001 + } else if (fmfs.equals("2")) {
  6002 + String fmName = FmTypeEnums.getFmNameById(fmfs);
  6003 + deliveryMode = fmName;
  6004 + }
  6005 + }
  6006 + }
  6007 + }
  6008 + }
  6009 + data.put("fmType", deliveryMode);//分娩方式
  6010 + String pregnancyOut = "";
  6011 + String sex = "";
  6012 + String weight = "";
  6013 + List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
  6014 + int num = 0;
  6015 + if (CollectionUtils.isNotEmpty(babies))
  6016 + {
  6017 + for(MaternalDeliverModel.Baby baby : babies)
  6018 + {
  6019 + String jj = RenShenJieJuEnums.getTitle(baby.getPregnancyOut());
  6020 + if("活产".equals(jj)){
  6021 + num++;
  6022 + }
  6023 + pregnancyOut += jj+",";
  6024 + sex += SexEnum.getTextById(
  6025 + Integer.parseInt(baby.getBabyGender()))+",";
  6026 + weight += baby.getBabyWeight()+",";
  6027 + }
  6028 + }
  6029 + data.put("pregnancyOut", pregnancyOut);
  6030 + data.put("num", num);
  6031 + data.put("sex", sex);
  6032 + data.put("weight", weight);
5976 6033 datas.add(data);
5977 6034 }
5978 6035 }
5979 6036  
... ... @@ -5981,12 +6038,23 @@
5981 6038 try {
5982 6039 out = response.getOutputStream();
5983 6040 Map <String, String> cnames = new LinkedHashMap <>();
5984   - cnames.put("coupon","是否方法优惠券");
  6041 + //cnames.put("coupon","是否方法优惠券");
5985 6042 cnames.put("name", "姓名");
5986 6043 cnames.put("cardNo", "身份证号");
5987 6044 cnames.put("fmDate", "分娩时间");
5988 6045 cnames.put("buildDate", "建档时间");
5989 6046 cnames.put("buildHospital", "建档机构");
  6047 + cnames.put("fmWeek", "分娩孕周");
  6048 + //户籍地址
  6049 + cnames.put("residence","户籍地");
  6050 + //居住地
  6051 + cnames.put("register", "居住地");
  6052 + cnames.put("fmHospital","分娩机构");
  6053 + cnames.put("fmType", "分娩方式");
  6054 + cnames.put("pregnancyOut", "围产儿情况");
  6055 + cnames.put("num", "活产数");
  6056 + cnames.put("sex", "性别");
  6057 + cnames.put("weight", "出生体重");
5990 6058 response.setContentType("application/octet-stream");
5991 6059 response.setCharacterEncoding("UTF-8");
5992 6060 response.setHeader("Content-Disposition", "attachment;fileName=" + "分娩.xls");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 641cb38
... ... @@ -1743,7 +1743,7 @@
1743 1743 WxMeasureInfoModel wxMeasureInfo = new WxMeasureInfoModel();
1744 1744 boolean falg = true;
1745 1745 if (StringUtils.isNotEmpty(pid) && StringUtils.isNotEmpty(hospitalId)) {
1746   - if (isOpenAutoSaveAntenatal(hospitalId)) {
  1746 + if (isOpenAutoSaveAntenatal(hospitalId) && !"216".equals(hospitalId)) {
1747 1747 List<AntenatalExaminationModel> examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid)), AntenatalExaminationModel.class);
1748 1748 if (CollectionUtils.isNotEmpty(examinationModel)) {
1749 1749 for (AntenatalExaminationModel model : examinationModel) {
... ... @@ -1806,6 +1806,7 @@
1806 1806 patients.setSource(source);
1807 1807 patients.setEnable("2");//隐藏档案
1808 1808 patients.setHospitalId(hospitalId);
  1809 + patients.setShortCode("A");
1809 1810 patients = patientsService.addPatient(patients);
1810 1811 }
1811 1812 }
... ... @@ -2029,6 +2030,7 @@
2029 2030 patients.setCreated(new Date());
2030 2031 patients.setSource(source);
2031 2032 patients.setEnable("2");//隐藏档案
  2033 + patients.setShortCode("B");
2032 2034 patients.setHospitalId(nutritionInfoRequest.getHospitalId());
2033 2035 patients = patientsService.addPatient(patients);
2034 2036 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 641cb38
... ... @@ -198,6 +198,7 @@
198 198 System.out.println("复诊时开始隐藏建档：" + parentId);
199 199 patients = findOnePatient(null, null, null, null, type, false, pid, false);
200 200 patients.setSource(patients.getId());
  201 + patients.setShortCode("C");
201 202 patients.setId(null);
202 203 patients.setHospitalId(hospitalId);
203 204 patients.setCreated(new Date());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 641cb38
... ... @@ -256,6 +256,7 @@
256 256 //在转入医院隐藏档案
257 257 patients.setEnable("2");
258 258 patients.setSource(referralApplyOrderAddRequest.getParentId());
  259 + patients.setShortCode("D");
259 260 id = patientsService.addPatient(patients).getId();
260 261 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), patients, OptActionEnums.ADD.getId(), "添加孕妇转诊");
261 262  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java View file @ 641cb38
... ... @@ -200,6 +200,7 @@
200 200 patients.setExpVip(0);
201 201 //在转入医院隐藏档案
202 202 patients.setEnable("2");
  203 + patients.setShortCode("E");
203 204 patients.setSource(referralApplyScreeningAddRequest.getParentId());
204 205 id = patientsService.addPatient(patients).getId();
205 206 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), patients, OptActionEnums.ADD.getId(), "添加孕妇转诊");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java View file @ 641cb38
... ... @@ -256,6 +256,10 @@
256 256 for (String rid : ids) {
257 257 basicConfigQuery.setId(rid);
258 258 List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
  259 + if (!CollectionUtils.isNotEmpty(basicConfigs))
  260 + {
  261 + continue;
  262 + }
259 263 Map<String, String> map = new HashMap<>();
260 264 map.put("id", basicConfigs.get(0).getId());
261 265 map.put("name", basicConfigs.get(0).getName());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 641cb38
... ... @@ -284,6 +284,7 @@
284 284 pat.setEnable("2");
285 285 pat.setHospitalId(hospitalId);
286 286 pat.setSource(source);
  287 + pat.setShortCode("F");
287 288 //pat.setFmHospital(hospitalId);
288 289 pat.setShortCode("1");
289 290 patientsService.addPatient(pat);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ 641cb38
... ... @@ -3285,6 +3285,34 @@
3285 3285 return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);
3286 3286 }
3287 3287  
  3288 +
  3289 + public BaseResponse getPublicHygieneServiceCount2(String provinceId, String cityId,String areaId,
  3290 + String streetId, Date dateTime,Integer type) {
  3291 + Date startDate=DateUtil.getDateMonthFirst(dateTime);
  3292 + Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
  3293 + List<Map> data=new ArrayList<>();
  3294 + Map<String,Object> mapTotal=new HashMap<>();
  3295 + //获得区县下的街道
  3296 + List<BasicConfig> regions = getRegions(areaId,streetId);
  3297 + for (BasicConfig region : regions) {
  3298 + Map<String,Object> streetMap=new HashMap<>();
  3299 + streetMap.put("streetName",region.getName());
  3300 + streetMap.put("streetId",region.getId());
  3301 + List<String> streetIds = new ArrayList<>();
  3302 + //医院数据
  3303 + getDateCount2(streetIds,startDate,endDate,streetMap,type);
  3304 + //合计
  3305 + mapTotal.put("streetName","合计");
  3306 + int lastDate1= null==mapTotal.get("data1")?0:Integer.parseInt(mapTotal.get("data1").toString());
  3307 + mapTotal.put("data1",null==streetMap.get("data1")?lastDate1:Integer.parseInt(streetMap.get("data1").toString())+lastDate1);
  3308 + int lastDate2= null==mapTotal.get("data2")?0:Integer.parseInt(mapTotal.get("data2").toString());
  3309 + mapTotal.put("data2",null==streetMap.get("data2")?lastDate2:Integer.parseInt(streetMap.get("data2").toString())+lastDate2);
  3310 + data.add(streetMap);
  3311 + }
  3312 + data.add(mapTotal);
  3313 + return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);
  3314 + }
  3315 +
3288 3316 public List<Map<String,String>> getHospitalIds(String provinceId, String cityId,String areaId,
3289 3317 String streetId)
3290 3318 {
... ... @@ -3965,6 +3993,34 @@
3965 3993 }
3966 3994 }
3967 3995  
  3996 +
  3997 + private void getDateCount2(List<String> streetIds,Date startDate, Date endDate,Map hospitalDate,Integer type){
  3998 + //传入的时间获取年的第一天
  3999 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(startDate));
  4000 + DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0
  4001 + BabyModelQuery babyModelQuery = new BabyModelQuery();
  4002 + babyModelQuery.setExistSource(false);
  4003 + babyModelQuery.setDataStatus(false);
  4004 + babyModelQuery.setBuildType(2);
  4005 + babyModelQuery.setPregnancyOut("0");
  4006 + babyModelQuery.setStreetIds(streetIds);
  4007 + babyModelQuery.setBirthStart(startDate);
  4008 + babyModelQuery.setBirthEnd(endDate);
  4009 +
  4010 + //本月活产数
  4011 + int data1= (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class);
  4012 +
  4013 + int lastDate1= null==hospitalDate.get("data1")?0:Integer.parseInt(hospitalDate.get("data1").toString());
  4014 + hospitalDate.put("data1",data1+lastDate1);
  4015 + //累计活产数
  4016 + babyModelQuery.setBirthStart(startDateFirst);
  4017 + int data2 = (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class);
  4018 +
  4019 + int lastDate2= null==hospitalDate.get("data2")?0:Integer.parseInt(hospitalDate.get("data2").toString());
  4020 +
  4021 + hospitalDate.put("data2",data2+lastDate2);
  4022 +
  4023 + }
3968 4024  
3969 4025 private void getDateCount1(Map<String,String> map,Date startDate, Date endDate,Map hospitalDate,Integer type){
3970 4026 String hospitalName = map.get("name");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 641cb38
... ... @@ -269,6 +269,7 @@
269 269 }
270 270 patients1.setId(null);
271 271 patients1.setSource(source);
  272 + patients1.setShortCode("G");
272 273 patients1.setHospitalId(hospital);
273 274 patients1.setBuildType(0);
274 275 patients1.setBookbuildingDoctor(postReviewRequest.getProdDoctor());