From c3f9f3265094cc4574483c09be7a4fd243a14728 Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 24 Apr 2020 17:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=88=9D=E8=AF=8A?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ViewController.java | 14 + .../web/facade/AntenatalExaminationFacade.java | 670 ++++++++++++--------- .../resources/spring/applicationContext-quartz.xml | 20 + 3 files changed, 411 insertions(+), 293 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 2e4252b..3bac066 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -98,6 +98,20 @@ public class ViewController extends BaseController { } /** + * 秦皇岛初诊手动同步接口 + * + * @param startDate + * @param endDate + * @return + */ + @RequestMapping(value = "/AntExChuTongbuSync", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse AntExChuTongbuSync(@RequestParam("startDate") String startDate, + @RequestParam("endDate") String endDate) { + BaseObjectResponse br = antenatalExaminationFacade.AntExChuTongbuSync(startDate, endDate, true); + return br; + } + /** * 下载初诊word * * @param id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e975b4b..b76f733 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.google.gson.Gson; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.pojo.QhdDjq; import com.lyms.hospitalapi.zcfy.ZcPrenatalService; @@ -13,10 +14,11 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.*; -import com.lyms.platform.common.result.*; -import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.BeanUtils; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.HttpClientUtil; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; @@ -36,10 +38,8 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.codehaus.jackson.map.util.BeanUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; @@ -356,9 +356,8 @@ public class AntenatalExaminationFacade { couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId()); //秦皇岛妇幼使用完优惠劵后需要把对应优惠劵插入到秦皇岛妇幼his - if ("216".equals(hospitalId)) - { - qhdCouponUse( hospitalId, antExAddRequest.getCouponCode(), userId); + if ("216".equals(hospitalId)) { + qhdCouponUse(hospitalId, antExAddRequest.getCouponCode(), userId); } } } @@ -405,7 +404,7 @@ public class AntenatalExaminationFacade { antenatalExaminationService.addOneBabyAnt(model); antExAddRequest.setId(model.getId()); //自动诊断高危 - autoExRisk(antExAddRequest,patients); + autoExRisk(antExAddRequest, patients); /** 验证产检券是否可用 可用就改为已使用状态 */ if (StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) { BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId)); @@ -415,9 +414,8 @@ public class AntenatalExaminationFacade { couponService.use(autoMatchFacade.getHospitalId(userId), antExAddRequest.getCouponCode(), userId, model.getId()); //秦皇岛妇幼使用完优惠劵后需要把对应优惠劵插入到秦皇岛妇幼his - if ("216".equals(hospitalId)) - { - qhdCouponUse( hospitalId, antExAddRequest.getCouponCode(), userId); + if ("216".equals(hospitalId)) { + qhdCouponUse(hospitalId, antExAddRequest.getCouponCode(), userId); } } } @@ -1127,15 +1125,13 @@ public class AntenatalExaminationFacade { } catch (Exception e) { } try { - if (StringUtils.isNotEmpty(excAddRequest.getCouponCode())) - { + if (StringUtils.isNotEmpty(excAddRequest.getCouponCode())) { /** 把优惠券设置为已使用状态 */ couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, excAddRequest.getId()); //秦皇岛妇幼使用完优惠劵后需要把对应优惠劵插入到秦皇岛妇幼his - if ("216".equals(hospitalId)) - { - qhdCouponUse( hospitalId, excAddRequest.getCouponCode(), userId); + if ("216".equals(hospitalId)) { + qhdCouponUse(hospitalId, excAddRequest.getCouponCode(), userId); } } } catch (Exception e) { @@ -1183,24 +1179,21 @@ public class AntenatalExaminationFacade { try { //处方计划 - if (excAddRequest.getNextCheckTime() != null) - { - saveCheckItem(DateUtil.parseYMD(excAddRequest.getNextCheckTime()),patients); + if (excAddRequest.getNextCheckTime() != null) { + saveCheckItem(DateUtil.parseYMD(excAddRequest.getNextCheckTime()), patients); } } catch (Exception e) { } try { //处方计划 - if (excAddRequest.getCheckTime()!= null) - { + if (excAddRequest.getCheckTime() != null) { saveCheckActual(DateUtil.parseYMD(excAddRequest.getCheckTime()), patients); } } catch (Exception e) { } try { - if (excAddRequest.getNextCheckTime() != null) - { + if (excAddRequest.getNextCheckTime() != null) { //追访统计 saveTrackCount(DateUtil.parseYMD(excAddRequest.getNextCheckTime()), patients); } @@ -1210,8 +1203,7 @@ public class AntenatalExaminationFacade { }); } - private void qhdCouponUse(final String hospitalId,final String code,final Integer userId) - { + private void qhdCouponUse(final String hospitalId, final String code, final Integer userId) { commonThreadPool.execute(new Runnable() { @Override @@ -1300,9 +1292,8 @@ public class AntenatalExaminationFacade { }); } - public TrackCountRecord saveTrackCount(Date nextCheckTime,Patients patients) - { - TrackCountRecord record = new TrackCountRecord(); + public TrackCountRecord saveTrackCount(Date nextCheckTime, Patients patients) { + TrackCountRecord record = new TrackCountRecord(); record.setHospitalId(patients.getHospitalId()); record.setPid(patients.getPid()); record.setPatientId(patients.getId()); @@ -1313,11 +1304,9 @@ public class AntenatalExaminationFacade { return record; } - public void updateTrackCount(Date checkTime,Date nextCheckTime,Patients patients) - { + public void updateTrackCount(Date checkTime, Date nextCheckTime, Patients patients) { TrackDayConfig trackDayConfig = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), TrackDayConfig.class); - if (trackDayConfig == null || trackDayConfig.getConfis() == null || trackDayConfig.getConfis().size() == 0) - { + if (trackDayConfig == null || trackDayConfig.getConfis() == null || trackDayConfig.getConfis().size() == 0) { return; } @@ -1325,40 +1314,33 @@ public class AntenatalExaminationFacade { antExRecordQuery.setPid(patients.getPid()); List recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); System.out.println(recordModels.size()); - if (CollectionUtils.isNotEmpty(recordModels) && recordModels.size() > 1) - { + if (CollectionUtils.isNotEmpty(recordModels) && recordModels.size() > 1) { TrackCountRecord record = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.DESC, "created")), TrackCountRecord.class); - if (record == null) - { - record = saveTrackCount(nextCheckTime,patients); + if (record == null) { + record = saveTrackCount(nextCheckTime, patients); } - System.out.println("record="+record); + System.out.println("record=" + record); AntExRecordModel recordModel = recordModels.get(1); - System.out.println("recordModel="+recordModel); + System.out.println("recordModel=" + recordModel); System.out.println(recordModel.getId()); System.out.println(DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime())); System.out.println(DateUtil.getyyyy_MM_dd(checkTime)); - if (DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime()).equals(DateUtil.getyyyy_MM_dd(checkTime))) - { + if (DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime()).equals(DateUtil.getyyyy_MM_dd(checkTime))) { record.setZsCheckStatus(1); Query query = Query.query(Criteria.where("_id").is(record.getId())); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(record)); mongoTemplate.updateFirst(query, update, TrackCountRecord.class); - } - else if (checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),4).getTime() && checkTime.getTime() > recordModel.getNextCheckTime().getTime()) - { + } else if (checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(), 4).getTime() && checkTime.getTime() > recordModel.getNextCheckTime().getTime()) { record.setJsCheckStatus(1); Query query = Query.query(Criteria.where("_id").is(record.getId())); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(record)); mongoTemplate.updateFirst(query, update, TrackCountRecord.class); - } - else if (checkTime.getTime() > DateUtil.addDay(recordModel.getNextCheckTime(),3).getTime()) - { + } else if (checkTime.getTime() > DateUtil.addDay(recordModel.getNextCheckTime(), 3).getTime()) { record.setLoseStatus(1); Query query = Query.query(Criteria.where("_id").is(record.getId())); Update update = MongoConvertHelper @@ -1366,20 +1348,17 @@ public class AntenatalExaminationFacade { mongoTemplate.updateFirst(query, update, TrackCountRecord.class); } //有效期召回人次 - List> configs = trackDayConfig.getConfis(); + List> configs = trackDayConfig.getConfis(); String riskLevelId = patients.getRiskLevelId(); - System.out.println("riskLevelId="+riskLevelId); - if (StringUtils.isNotEmpty(riskLevelId) && !"[]".equals(riskLevelId)) - { + System.out.println("riskLevelId=" + riskLevelId); + if (StringUtils.isNotEmpty(riskLevelId) && !"[]".equals(riskLevelId)) { List rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); Integer day = getTrackDay(rlevel, configs); - System.out.println("day="+day); - if (day != null) - { - System.out.println(checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),day+1).getTime()); + System.out.println("day=" + day); + if (day != null) { + System.out.println(checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(), day + 1).getTime()); System.out.println(checkTime.getTime() >= recordModel.getNextCheckTime().getTime()); - if (checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),day+1).getTime() && checkTime.getTime() >= recordModel.getNextCheckTime().getTime()) - { + if (checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(), day + 1).getTime() && checkTime.getTime() >= recordModel.getNextCheckTime().getTime()) { record.setBackStatus(1); Query query = Query.query(Criteria.where("_id").is(record.getId())); @@ -1393,82 +1372,62 @@ public class AntenatalExaminationFacade { } } - private Integer getTrackDay(List rlevel,List> configs) - { - Integer day = null; + private Integer getTrackDay(List rlevel, List> configs) { + Integer day = null; //紫色 - if (rlevel.contains("224b2329-cb82-4da3-a071-8527f8283aab")) - { - day = getDay(configs,"224b2329-cb82-4da3-a071-8527f8283aab"); + if (rlevel.contains("224b2329-cb82-4da3-a071-8527f8283aab")) { + day = getDay(configs, "224b2329-cb82-4da3-a071-8527f8283aab"); } // - else if (rlevel.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) - { - day = getDay(configs,"eb146c03-b19f-4e28-b85f-fda574b2283b"); - } - else if (rlevel.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) - { - day = getDay(configs,"49a36aea-c5b6-4162-87d2-9eb3c6ec00c2"); - } - else if (rlevel.contains("315107bd-91fe-42a1-9237-752f3c046a40")) - { - day = getDay(configs,"315107bd-91fe-42a1-9237-752f3c046a40"); - } - else if (rlevel.contains("e637b361-99cf-41eb-84f2-f0dab596e928")) - { - day = getDay(configs,"e637b361-99cf-41eb-84f2-f0dab596e928"); + else if (rlevel.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) { + day = getDay(configs, "eb146c03-b19f-4e28-b85f-fda574b2283b"); + } else if (rlevel.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) { + day = getDay(configs, "49a36aea-c5b6-4162-87d2-9eb3c6ec00c2"); + } else if (rlevel.contains("315107bd-91fe-42a1-9237-752f3c046a40")) { + day = getDay(configs, "315107bd-91fe-42a1-9237-752f3c046a40"); + } else if (rlevel.contains("e637b361-99cf-41eb-84f2-f0dab596e928")) { + day = getDay(configs, "e637b361-99cf-41eb-84f2-f0dab596e928"); } return day; } - private Integer getDay(List> configs,String rlevel) - { - for (Map config : configs) - { - if (config.get("riskLevel").equals(rlevel)) - { + private Integer getDay(List> configs, String rlevel) { + for (Map config : configs) { + if (config.get("riskLevel").equals(rlevel)) { return Integer.parseInt(config.get("day")); } } - return null; + return null; } - public void saveCheckItem(Date nextCheckTime,Patients patients) - { + public void saveCheckItem(Date nextCheckTime, Patients patients) { List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); - if (CollectionUtils.isNotEmpty(itemConfigs)) - { - for(CheckItemConfig checkItemConfig : itemConfigs) - { - //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 - int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1),nextCheckTime); - if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) - { - CheckItemOrder order = new CheckItemOrder(); - order.setCreated(new Date()); - order.setHospitalId(patients.getHospitalId()); - order.setNextCheckTime(nextCheckTime); - order.setItemId(checkItemConfig.getId()); - order.setPatientId(patients.getId()); - mongoTemplate.save(order); - } - } + if (CollectionUtils.isNotEmpty(itemConfigs)) { + for (CheckItemConfig checkItemConfig : itemConfigs) { + //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 + int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1), nextCheckTime); + if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { + CheckItemOrder order = new CheckItemOrder(); + order.setCreated(new Date()); + order.setHospitalId(patients.getHospitalId()); + order.setNextCheckTime(nextCheckTime); + order.setItemId(checkItemConfig.getId()); + order.setPatientId(patients.getId()); + mongoTemplate.save(order); + } + } } } - public void saveCheckActual(Date checkTime,Patients patients) - { + public void saveCheckActual(Date checkTime, Patients patients) { List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); - if (CollectionUtils.isNotEmpty(itemConfigs)) - { - for(CheckItemConfig checkItemConfig : itemConfigs) - { + if (CollectionUtils.isNotEmpty(itemConfigs)) { + for (CheckItemConfig checkItemConfig : itemConfigs) { //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 - int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1),checkTime); - if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) - { - CheckItemActual actual = new CheckItemActual(); + int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1), checkTime); + if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { + CheckItemActual actual = new CheckItemActual(); actual.setCreated(new Date()); actual.setHospitalId(patients.getHospitalId()); actual.setCheckTime(checkTime); @@ -2579,6 +2538,7 @@ public class AntenatalExaminationFacade { } return new BaseObjectResponse().setData(resultMap).setErrorcode(ErrorCodeConstants.SUCCESS); } + public static Date strToDateLong(String strDate) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); ParsePosition pos = new ParsePosition(0); @@ -2619,7 +2579,7 @@ public class AntenatalExaminationFacade { return stringBuffer; } - public void bChaoTimerWork() { + public void bChaoTimerWork() { /* 需求： 初诊B超数据一般在初诊后两天内产生结果，要求将B超结果出来更新初诊B超数据值。 @@ -2629,7 +2589,14 @@ public class AntenatalExaminationFacade { String startDate1 = getDateOther(new Date(), 2);//当前时间的前两天 String endDate1 = DateUtil.getyyyy_MM_dd(new Date());//当前时间 System.out.println("start=" + startDate1 + "end=" + endDate1); - AntExChuSync(startDate1,endDate1,true); + AntExChuSync(startDate1, endDate1, true); + } + + public void bChuZhengTimerWork() { + String startDate1 = DateUtil.getyyyy_MM_dd(new Date());//当前时间 + String endDate1 = DateUtil.getyyyy_MM_dd(new Date());//当前时间 + System.out.println("start=" + startDate1 + "end=" + endDate1); + AntExChuTongbuSync(startDate1, endDate1, true); } /** @@ -2638,85 +2605,224 @@ public class AntenatalExaminationFacade { * @param endDate * @return */ - public BaseObjectResponse AntExChuSync(String startDate, String endDate,boolean b) { + public BaseObjectResponse AntExChuSync(String startDate, String endDate, boolean b) { - //1 获取2018-10-01 到 2019-09-10，秦皇岛说有的初证数据。 - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setCheckTimeStart(strToDateLong(startDate)); - antExChuQuery.setCheckTimeEnd(strToDateLong(endDate)); - antExChuQuery.setHospitalId("216"); - antExChuQuery.setYn(YnEnums.YES.getId()); - List antExChu = antenatalExaminationService.queryAntExChu(antExChuQuery); - System.out.println("获取秦皇岛初诊条数："+antExChu.size()); - if (CollectionUtils.isNotEmpty(antExChu)) { - for (int i = 0; i antExChu = antenatalExaminationService.queryAntExChu(antExChuQuery); + System.out.println("获取秦皇岛初诊条数：" + antExChu.size()); + if (CollectionUtils.isNotEmpty(antExChu)) { + for (int i = 0; i < antExChu.size(); i++) + try { - if (antExChu.get(i) == null || antExChu.get(i).getCheckTime() == null) { - if(b){ - operateLogFacade.addModifyOptLog(null, 2160001, antExChu.get(i), antExChu.get(i), OptActionEnums.ADD.getId(), "初诊产检日期为空"); - } - continue; - } - Date checkTime = antExChu.get(i).getCheckTime();//产检日期 - if(checkTime.equals(null) || checkTime==null ){ - checkTime = antExChu.get(i).getCreated();//初诊创建时间 + if (antExChu.get(i) == null || antExChu.get(i).getCheckTime() == null) { + if (b) { + operateLogFacade.addModifyOptLog(null, 2160001, antExChu.get(i), antExChu.get(i), OptActionEnums.ADD.getId(), "初诊产检日期为空"); } - //2 遍历初证数据，获取单个初诊数据的初证日期，根据初证日志调用接口 获取B超检查结果。更新初证B超数据。 - Patients patients = iPatientDao.getPatient(antExChu.get(i).getParentId()); - if (patients == null || patients.getVcCardNo() == null) { - if(b){ - operateLogFacade.addModifyOptLog(null, 2160002, patients, patients.getVcCardNo(), OptActionEnums.ADD.getId(), "就诊卡号为空"); - } - continue; + continue; + } + Date checkTime = antExChu.get(i).getCheckTime();//产检日期 + if (checkTime.equals(null) || checkTime == null) { + checkTime = antExChu.get(i).getCreated();//初诊创建时间 + } + //2 遍历初证数据，获取单个初诊数据的初证日期，根据初证日志调用接口 获取B超检查结果。更新初证B超数据。 + Patients patients = iPatientDao.getPatient(antExChu.get(i).getParentId()); + if (patients == null || patients.getVcCardNo() == null) { + if (b) { + operateLogFacade.addModifyOptLog(null, 2160002, patients, patients.getVcCardNo(), OptActionEnums.ADD.getId(), "就诊卡号为空"); } - String s = null; - String vcCardNo = patients.getVcCardNo(); - Map map = new HashMap(); - - String startDate1 = DateUtil.getyyyy_MM_dd(checkTime); - String endDate1 = getDateAfter(checkTime, 2); - map.put("vcCardNo", vcCardNo); - map.put("startDate", startDate1); - map.put("endDate", endDate1); - s = HttpClientUtil.doGet("http://localhost:9090/lis/qhdris", map, "utf-8", null); - System.out.println("获取B超信息：" + s); - if (("[]"==s || "[]".equals(s)) || StringUtils.isEmpty(s)) { - if(b){ - operateLogFacade.addModifyOptLog(null, 2160003, map, s, OptActionEnums.ADD.getId(), "获取B超信息失败或为空"); - } - continue; + continue; + } + String s = null; + String vcCardNo = patients.getVcCardNo(); + Map map = new HashMap(); + + String startDate1 = DateUtil.getyyyy_MM_dd(checkTime); + String endDate1 = getDateAfter(checkTime, 2); + map.put("vcCardNo", vcCardNo); + map.put("startDate", startDate1); + map.put("endDate", endDate1); + s = HttpClientUtil.doGet("http://localhost:9090/lis/qhdris", map, "utf-8", null); + System.out.println("获取B超信息：" + s); + if (("[]" == s || "[]".equals(s)) || StringUtils.isEmpty(s)) { + if (b) { + operateLogFacade.addModifyOptLog(null, 2160003, map, s, OptActionEnums.ADD.getId(), "获取B超信息失败或为空"); } - if(StringUtils.isEmpty(antExChu.get(i).getbChao())){ - AntExChuModel antExChuModel = antExChu.get(i); - antExChuModel.setbChao(getStrings(s).toString()); - iAntExChuDao.updateOneAntEx(antExChu.get(i), antExChu.get(i).getId()); - if(b){ - operateLogFacade.addModifyOptLog(null, 2160004, null, antExChuModel, OptActionEnums.ADD.getId(), "初诊更新B超成功"); - } - }else if(b){ - operateLogFacade.addModifyOptLog(null, 2160005, null, antExChu.get(i), OptActionEnums.ADD.getId(), "无需更新B超信息"); + continue; + } + if (StringUtils.isEmpty(antExChu.get(i).getbChao())) { + AntExChuModel antExChuModel = antExChu.get(i); + antExChuModel.setbChao(getStrings(s).toString()); + iAntExChuDao.updateOneAntEx(antExChuModel, antExChu.get(i).getId()); + if (b) { + operateLogFacade.addModifyOptLog(null, 2160004, null, antExChuModel, OptActionEnums.ADD.getId(), "初诊更新B超成功"); } - - } catch (Exception e) { - e.printStackTrace(); - if(b){ - operateLogFacade.addModifyOptLog(null, 2160006, null, antExChu.get(i), OptActionEnums.ADD.getId(), "初诊B超同步接口异常"); - } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + } else if (b) { + operateLogFacade.addModifyOptLog(null, 2160005, null, antExChu.get(i), OptActionEnums.ADD.getId(), "无需更新B超信息"); } - }else { - if(b){ - operateLogFacade.addModifyOptLog(null, 2160007, startDate, endDate, OptActionEnums.ADD.getId(), "初诊数据为空"); + } catch (Exception e) { + e.printStackTrace(); + if (b) { + operateLogFacade.addModifyOptLog(null, 2160006, null, antExChu.get(i), OptActionEnums.ADD.getId(), "初诊B超同步接口异常"); + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("获取"+startDate+" 到 "+endDate+"，秦皇岛的初诊数据条数："+antExChu.size()); + + } else { + if (b) { + operateLogFacade.addModifyOptLog(null, 2160007, startDate, endDate, OptActionEnums.ADD.getId(), "初诊数据为空"); } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("获取" + startDate + " 到 " + endDate + "，秦皇岛的初诊数据条数：" + antExChu.size()); + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseObjectResponse AntExChuTongbuSync(String startDate, String endDate, boolean b) { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setCheckTimeStart(strToDateLong(startDate)); + antExChuQuery.setCheckTimeEnd(DateUtil.getDayLastSecond(strToDateLong(endDate))); + antExChuQuery.setHospitalId("216"); + antExChuQuery.setYn(YnEnums.YES.getId()); + List antExChu = antenatalExaminationService.queryAntExChu(antExChuQuery); + System.out.println("获取秦皇岛初诊条数：" + antExChu.size()); + if (CollectionUtils.isNotEmpty(antExChu)) { + for (int i = 0; i < antExChu.size(); i++) { + try { + AntExChuModel antExChuModel = antExChu.get(i); + + Patients patients = iPatientDao.getPatient(antExChuModel.getParentId()); + if (patients == null || patients.getVcCardNo() == null || patients.getCardNo() == null || patients.getUsername() == null || patients.getPhone() == null) { + continue; + } + String s = null; + Map map = new HashMap(); + map.put("vcCardNo", patients.getVcCardNo()); + map.put("cardNo", patients.getCardNo()); + map.put("name", patients.getUsername()); + map.put("phone", patients.getPhone()); + s = HttpClientUtil.doGet("http://localhost:9090/his/qhdToChuzheng", map, "utf-8", null); + System.out.println("获取初诊信息信息：" + s); + if(StringUtils.isEmpty(s)){ + continue; + } + Gson gson = new Gson(); + Map maps = new HashMap(); + maps = gson.fromJson(s, maps.getClass()); + if (StringUtils.isEmpty(antExChu.get(i).getXhdb())) { + antExChuModel.setXhdb(maps.get("xhdb")); + } + if (StringUtils.isEmpty(antExChu.get(i).getBxbjs())) { + antExChuModel.setBxbjs(maps.get("bxbjs")); + } + if (StringUtils.isEmpty(antExChu.get(i).getPlatelet())) { + antExChuModel.setPlatelet(maps.get("xxbjs")); + } + if (StringUtils.isEmpty(antExChu.get(i).getNdb())) {//尿蛋白 + antExChuModel.setNdb(maps.get("ndb")); + } + if (StringUtils.isEmpty(antExChu.get(i).getUrineKetone())) {//尿酮体 + antExChuModel.setUrineKetone(maps.get("nt")); + } + if (StringUtils.isEmpty(antExChu.get(i).getBld())) {//尿潜血 + antExChuModel.setBld(maps.get("nqx")); + } + if (StringUtils.isEmpty(antExChu.get(i).getNt())) {//尿糖 + antExChuModel.setNt(maps.get("nt")); + } + if (StringUtils.isEmpty(antExChu.get(i).getAbo())) {//血型 + antExChuModel.setAbo(maps.get("xx")); + } + if (StringUtils.isEmpty(antExChu.get(i).getRh())) {//RH血型 + antExChuModel.setRh(maps.get("rhxx")); + } + if (StringUtils.isEmpty(antExChu.get(i).getBloodSugar())) {//血糖 + antExChuModel.setBloodSugar(maps.get("xt")); + } + if (StringUtils.isEmpty(antExChu.get(i).getXqgbzam())) {//血清谷丙转氨酶 + antExChuModel.setXqgbzam(maps.get("xqgbzam")); + } + if (StringUtils.isEmpty(antExChu.get(i).getXqgczam())) {//血清谷草转氨酶 + antExChuModel.setXqgczam(maps.get("xqgczam")); + } + if (StringUtils.isEmpty(antExChu.get(i).getAlbumin())) {//白蛋白 + antExChuModel.setAlbumin(maps.get("bdb")); + } + if (StringUtils.isEmpty(antExChu.get(i).getTotalBilirubin())) {//总胆红素 + antExChuModel.setTotalBilirubin(maps.get("zdhs")); + } + if (StringUtils.isEmpty(antExChu.get(i).getJhBilirubin())) {//直接胆红素 + antExChuModel.setJhBilirubin(maps.get("zjdhs")); + } + if (StringUtils.isEmpty(antExChu.get(i).getBg())) {//丙肝 + antExChuModel.setBg(maps.get("bg")); + } + if (StringUtils.isEmpty(antExChu.get(i).getYgbmky())) {//乙肝表面抗原 + antExChuModel.setYgbmky(maps.get("ygbmky")); + } + if (StringUtils.isEmpty(antExChuModel.getYgbmkyValue())) { + antExChuModel.setYgbmkyValue(maps.get("ygbmkyValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getYgbmkt())) {//乙肝表面抗体 + antExChuModel.setYgbmkt(maps.get("ygbmkt")); + } + if (StringUtils.isEmpty(antExChuModel.getYgbmktValue())) { + antExChuModel.setYgbmktValue(maps.get("ygbmktValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getYgeky())) {//乙肝E抗原 + antExChuModel.setYgeky(maps.get("ygeky")); + } + if (StringUtils.isEmpty(antExChuModel.getYgekyValue())) { + antExChuModel.setYgekyValue(maps.get("ygekyValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getYgekt())) {//乙肝E抗体 + antExChuModel.setYgekt(maps.get("ygekt")); + } + if (StringUtils.isEmpty(antExChuModel.getYgektValue())) { + antExChuModel.setYgektValue(maps.get("ygektValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getYghxkt())) {//乙肝核心抗体 + antExChuModel.setYghxkt(maps.get("yghxkt")); + } + if (StringUtils.isEmpty(antExChuModel.getYghxktValue())) { + antExChuModel.setYghxktValue(maps.get("yghxktValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getXqjq())) {//血清肌酐 + antExChuModel.setXqjq(maps.get("xqjg")); + } + if (StringUtils.isEmpty(antExChu.get(i).getXnsd())) {//血尿素氮 + antExChuModel.setXnsd(maps.get("xnsd")); + } + if (StringUtils.isEmpty(antExChu.get(i).getSyjg())) {//梅毒 + antExChuModel.setSyjg(maps.get("md")); + } + if (StringUtils.isEmpty(antExChuModel.getSyjgValue())) { + antExChuModel.setSyjgValue(maps.get("mdValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getHivkt())) {//HIV抗体 + antExChuModel.setHivkt(maps.get("hivkt")); + } + if (StringUtils.isEmpty(antExChuModel.getHivktValue())) { + antExChuModel.setHivktValue(maps.get("hivktValue")); + } + if (StringUtils.isEmpty(antExChu.get(i).getYdqjd())) {//阴道清洁度 + antExChuModel.setYdqjd(maps.get("ydqjd")); + } + iAntExChuDao.updateOneAntEx(antExChuModel, antExChu.get(i).getId()); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } public class SortIn { @@ -3061,7 +3167,7 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(vcCardNo)) { //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy - if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { + if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } else { patientsQuery.setVcCardNo(vcCardNo); @@ -4250,31 +4356,30 @@ public class AntenatalExaminationFacade { } - public void autoPatientRisk(Patients pat,Integer userId) - { + public void autoPatientRisk(Patients pat, Integer userId) { AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); autoRiskRequest.setParentId(pat.getId()); - List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),0); - saveAutoRisk(riskList,null,pat.getHospitalId(),pat.getPid(),pat.getId(),0); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(), 0); + saveAutoRisk(riskList, null, pat.getHospitalId(), pat.getPid(), pat.getId(), 0); } /** * 初诊自动诊断高危 + * * @param antExcAddRequest * @param pat */ - public void autoExcRisk(final AntExcAddRequest antExcAddRequest,final Patients pat) - { + public void autoExcRisk(final AntExcAddRequest antExcAddRequest, final Patients pat) { commonThreadPool.execute(new Runnable() { @Override public void run() { - AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); + AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); org.springframework.beans.BeanUtils.copyProperties(antExcAddRequest, autoRiskRequest); String fid = antExcAddRequest.getId(); - System.out.println("autoExcRisk fid = "+fid); - List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),1); - saveAutoRisk(riskList,fid,pat.getHospitalId(),pat.getPid(),pat.getId(),1); + System.out.println("autoExcRisk fid = " + fid); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(), 1); + saveAutoRisk(riskList, fid, pat.getHospitalId(), pat.getPid(), pat.getId(), 1); } }); } @@ -4282,15 +4387,15 @@ public class AntenatalExaminationFacade { /** * 复诊自动诊断高危 + * * @param antExAddRequest - * @param pat 档案信息 + * @param pat 档案信息 */ - public void autoExRisk(final AntExAddRequest antExAddRequest,final Patients pat) - { + public void autoExRisk(final AntExAddRequest antExAddRequest, final Patients pat) { commonThreadPool.execute(new Runnable() { @Override public void run() { - AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); + AutoRiskRequest autoRiskRequest = new AutoRiskRequest(); autoRiskRequest.setBp(antExAddRequest.getBp()); autoRiskRequest.setGonggao(antExAddRequest.getGongGao()); @@ -4305,101 +4410,95 @@ public class AntenatalExaminationFacade { autoRiskRequest.setBloodSugar(antExAddRequest.getBloodSugar()); String fid = antExAddRequest.getId(); - System.out.println("autoExRisk fid = "+fid); - List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(),2); - saveAutoRisk(riskList,fid,pat.getHospitalId(),pat.getPid(),pat.getId(),2); + System.out.println("autoExRisk fid = " + fid); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(), 2); + saveAutoRisk(riskList, fid, pat.getHospitalId(), pat.getPid(), pat.getId(), 2); } }); } /** - * - * @param risks 高危因素 - * @param fid 产检id(初诊、复诊) + * @param risks 高危因素 + * @param fid 产检id(初诊、复诊) * @param hospitalId 医院id * @param pid * @param patientId - * @param type 0 建档诊断 1产检诊断 + * @param type 0 建档诊断 1产检诊断 */ - private void saveAutoRisk(List> risks,String fid,String hospitalId,String pid,String patientId,Integer type) - { - if (CollectionUtils.isNotEmpty(risks)) - { - List rLevel = new ArrayList(); - List hRisk = new ArrayList(); - Integer score = 0; - for(Map risk : risks) - { - rLevel.add(risk.get("riskLevel")); - hRisk.add(risk.get("id")); - score+= StringUtils.isNotEmpty(risk.get("code")) ? Integer.parseInt(risk.get("code")) : 0; - } - - if (StringUtils.isNotEmpty(fid)) - { - Query query = new Query(); - query.addCriteria(Criteria.where("fid").is(fid)); - AutoRiskRecord autoRisk = mongoTemplate.findOne(query, AutoRiskRecord.class); - if (autoRisk != null) - { - return; - } - } - AutoRiskRecord riskRecord = new AutoRiskRecord(); - riskRecord.setPatientId(patientId); - riskRecord.setFid(fid); - riskRecord.setPid(pid); - riskRecord.setHospitalId(hospitalId); - riskRecord.setStatus(0); - riskRecord.setType(type); - riskRecord.sethRisk(hRisk); - riskRecord.sethLevel(rLevel); - riskRecord.sethScore(score); - riskRecord.setCreated(new Date()); - riskRecord.setModified(new Date()); - mongoTemplate.save(riskRecord); - - } + private void saveAutoRisk(List> risks, String fid, String hospitalId, String pid, String patientId, Integer type) { + if (CollectionUtils.isNotEmpty(risks)) { + List rLevel = new ArrayList(); + List hRisk = new ArrayList(); + Integer score = 0; + for (Map risk : risks) { + rLevel.add(risk.get("riskLevel")); + hRisk.add(risk.get("id")); + score += StringUtils.isNotEmpty(risk.get("code")) ? Integer.parseInt(risk.get("code")) : 0; + } + + if (StringUtils.isNotEmpty(fid)) { + Query query = new Query(); + query.addCriteria(Criteria.where("fid").is(fid)); + AutoRiskRecord autoRisk = mongoTemplate.findOne(query, AutoRiskRecord.class); + if (autoRisk != null) { + return; + } + } + AutoRiskRecord riskRecord = new AutoRiskRecord(); + riskRecord.setPatientId(patientId); + riskRecord.setFid(fid); + riskRecord.setPid(pid); + riskRecord.setHospitalId(hospitalId); + riskRecord.setStatus(0); + riskRecord.setType(type); + riskRecord.sethRisk(hRisk); + riskRecord.sethLevel(rLevel); + riskRecord.sethScore(score); + riskRecord.setCreated(new Date()); + riskRecord.setModified(new Date()); + mongoTemplate.save(riskRecord); + + } } /** - * * 由初诊页面调用该方法 * 初诊自动判定高危因素 + * * @param antExcAddRequest * @param userId * @return */ public BaseResponse getAntexExRisk(AutoRiskRequest antExcAddRequest, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - List> riskList = autoRisk(antExcAddRequest,hospitalId,1); + List> riskList = autoRisk(antExcAddRequest, hospitalId, 1); return new BaseObjectResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } /** * 自动判定高危因素 + * * @param antExcAddRequest * @param hospitalId * @return */ - private List> autoRisk(AutoRiskRequest antExcAddRequest,String hospitalId,Integer type) - { + private List> autoRisk(AutoRiskRequest antExcAddRequest, String hospitalId, Integer type) { Set list = new HashSet<>(); DiagnoseConfigQuery diagnoseConfigQuery = new DiagnoseConfigQuery(); diagnoseConfigQuery.setHospitalId(hospitalId); List configModels = diagnoseConfigService.queryDiagnoseConfigs(diagnoseConfigQuery); - System.out.println("configModels"+configModels); + System.out.println("configModels" + configModels); List> riskList = new ArrayList<>(); Map status = new HashMap<>(); if (CollectionUtils.isNotEmpty(configModels)) { DiagnoseConfigModel model = configModels.get(0); - System.out.println("model"+model); + System.out.println("model" + model); List> configs = model.getConfigs(); if (model == null || "0".equals(model.getEnable()) || configs == null || configs.size() == 0) { @@ -4412,7 +4511,7 @@ public class AntenatalExaminationFacade { } } Map> mapItems = getRiskConfig(configModels); - System.out.println("mapItems"+mapItems); + System.out.println("mapItems" + mapItems); if (mapItems != null && mapItems.size() > 0) { if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId()) && type == 0) { Patients patients = patientsService.findOnePatientById(antExcAddRequest.getParentId()); @@ -5506,7 +5605,7 @@ public class AntenatalExaminationFacade { } riskList = diagnoseConfigFacde.getRiskName(ids); } - return riskList; + return riskList; } @@ -5613,15 +5712,11 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); patientses = patientsService.queryPatient1(patientsQuery, "created"); - if (CollectionUtils.isEmpty(patientses)) - { - return new BaseListResponse().setData(riskList). + if (CollectionUtils.isEmpty(patientses)) { + return new BaseListResponse().setData(riskList). setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); - } - else - { - for (Patients pat : patientses) - { + } else { + for (Patients pat : patientses) { patientIds.add(pat.getId()); } } @@ -5655,34 +5750,32 @@ public class AntenatalExaminationFacade { baseQuery.setPage(antExManagerQueryRequest.getPage()); baseQuery.setLimit(antExManagerQueryRequest.getLimit()); baseQuery.mysqlBuild((int) count); - System.out.println(baseQuery.getOffset()+" "+antExManagerQueryRequest.getLimit()); + System.out.println(baseQuery.getOffset() + " " + antExManagerQueryRequest.getLimit()); query.skip(baseQuery.getOffset()).limit(antExManagerQueryRequest.getLimit()); System.out.println(query.toString()); List models = mongoTemplate.find(query.with(new Sort(Sort.Direction.DESC, "created")), AutoRiskRecord.class); - if (CollectionUtils.isNotEmpty(models)) - { - for(AutoRiskRecord model : models) - { + if (CollectionUtils.isNotEmpty(models)) { + for (AutoRiskRecord model : models) { Map map = new HashMap(); - map.put("id",model.getId()); + map.put("id", model.getId()); Patients pat = patientsService.findOnePatientById(model.getPatientId()); - map.put("name",pat.getUsername()); - map.put("cardNo",pat.getCardNo()); - map.put("phone",pat.getPhone()); - map.put("autoTime",DateUtil.getyyyy_MM_dd(model.getCreated())); - map.put("week",DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); - map.put("riskLevel",commonService.findRiskLevel(model.gethLevel())); + map.put("name", pat.getUsername()); + map.put("cardNo", pat.getCardNo()); + map.put("phone", pat.getPhone()); + map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); + map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); + map.put("riskLevel", commonService.findRiskLevel(model.gethLevel())); String risk = commonService.resloveFactor(model.gethRisk()); - map.put("risk",risk); - map.put("score",model.gethScore()); - map.put("status",model.getStatus() == 0 ? "未确诊" : "已确诊"); + map.put("risk", risk); + map.put("score", model.gethScore()); + map.put("status", model.getStatus() == 0 ? "未确诊" : "已确诊"); riskList.add(map); } } - return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); + return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo()); } public BaseResponse getAutoRiskCount(Integer userId) { @@ -5691,7 +5784,7 @@ public class AntenatalExaminationFacade { query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); query.addCriteria(Criteria.where("status").is(0)); long count = mongoTemplate.count(query.with(new Sort(Sort.Direction.DESC, "created")), AutoRiskRecord.class); - return new BaseObjectResponse().setData(count).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return new BaseObjectResponse().setData(count).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -5699,8 +5792,7 @@ public class AntenatalExaminationFacade { Query query = new Query(); query.addCriteria(Criteria.where("_id").is(id)); AutoRiskRecord autoRisk = mongoTemplate.findOne(query, AutoRiskRecord.class); - if (autoRisk != null) - { + if (autoRisk != null) { if (autoRisk.getType() == 0) { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -5716,8 +5808,7 @@ public class AntenatalExaminationFacade { } catch (Exception e) { } List riskList = new ArrayList<>(autoRisk.gethRisk()); - if (CollectionUtils.isNotEmpty(li)) - { + if (CollectionUtils.isNotEmpty(li)) { riskList.addAll(li); } @@ -5725,9 +5816,7 @@ public class AntenatalExaminationFacade { excAddRequest.setParentId(autoRisk.getPatientId()); addOneAnetExChu(excAddRequest, userId); } - } - else if (autoRisk.getType() == 1) - { + } else if (autoRisk.getType() == 1) { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setId(autoRisk.getFid()); @@ -5742,23 +5831,19 @@ public class AntenatalExaminationFacade { } catch (Exception e) { } List riskList = autoRisk.gethRisk(); - if (CollectionUtils.isNotEmpty(li)) - { + if (CollectionUtils.isNotEmpty(li)) { riskList.addAll(li); } excAddRequest.setHighrisk(riskList); excAddRequest.setParentId(autoRisk.getPatientId()); addOneAnetExChu(excAddRequest, userId); } - } - else if (autoRisk.getType() == 2) - { + } else if (autoRisk.getType() == 2) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setId(autoRisk.getFid()); antExQuery.setYn(YnEnums.YES.getId()); List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created")); - if (CollectionUtils.isNotEmpty(examinationModelList)) - { + if (CollectionUtils.isNotEmpty(examinationModelList)) { AntenatalExaminationModel model = examinationModelList.get(0); AntExAddRequest excAddRequest = new AntExAddRequest(); excAddRequest.setId(model.getId()); @@ -5768,13 +5853,12 @@ public class AntenatalExaminationFacade { } catch (Exception e) { } List riskList = autoRisk.gethRisk(); - if (CollectionUtils.isNotEmpty(li)) - { + if (CollectionUtils.isNotEmpty(li)) { riskList.addAll(li); } excAddRequest.setRiskFactor(riskList); excAddRequest.setParentId(autoRisk.getPatientId()); - addOneAntEx(excAddRequest,userId); + addOneAntEx(excAddRequest, userId); } } Query updateQuery = Query.query(Criteria.where("_id").is(autoRisk.getId())); @@ -5783,6 +5867,6 @@ public class AntenatalExaminationFacade { .convertToNativeUpdate(ReflectionUtils.getUpdateField(autoRisk)); mongoTemplate.updateFirst(updateQuery, update, AutoRiskRecord.class); } - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 1366095..94b879e 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -115,6 +115,18 @@ + + + + + + + + + + + + @@ -195,6 +207,12 @@ + + + + + + @@ -446,6 +464,8 @@ + + -- 1.8.3.1