From e2e8085c1cc8b5aac833b3697f8105625797026a Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 25 Mar 2021 17:15:16 +0800 Subject: [PATCH] update --- .../com/lyms/platform/common/utils/DateUtil.java | 15 +- .../operate/web/controller/TestController.java | 9 + .../operate/web/facade/BabySieveFacede.java | 195 +++++++++++++++------ .../resources/spring/applicationContext-quartz.xml | 18 ++ 4 files changed, 178 insertions(+), 59 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 8e1b027..453525c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -902,7 +902,20 @@ public class DateUtil { .get(Calendar.DATE) + 1, 0, 0, 0); return (int) (tommorowDate.getTimeInMillis() - curDate.getTimeInMillis()) / 1000; } - + /** + * 参照日期之前或之后days的日期 + * + * @param days 天数(之前为负数,之后为正数) + * @Author: 武涛涛 + * @Date: 2021/3/25 13:38 + */ + public static Date getBeforeOrAfter( int days) { + Date date = new Date(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + days); + return calendar.getTime(); + } /** * 计算儿童的月龄 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 27b63ae..0758b49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -212,6 +212,15 @@ public class TestController extends BaseController { highRisks.put("4ec114d7-9c78-4dfc-878c-1139ef3ff04c", "5a40c73c422b03d4ad2bf7bf"); //骨盆狭窄或产道畸形，--- 生殖道畸形和骨盆狭小 highRisks.put("3af4b6fd-0bb9-4f4b-9d8f-916df71955cf", "5a430fe4422b03d4ad2bf82b"); //胸廓畸形伴轻度肺功能不全---- 胸廓畸形等伴轻度肺功能不全 } + + @RequestMapping(method = RequestMethod.GET, value = "/babyShortMessageQhdTimerWork") + @ResponseBody + //增加产筛申请单 + public BaseResponse updateSieveApplyOrder() { + babySieveFacede.babyShortMessageQhdTimerWork(); + return null; + } + /** * 功能描述 衡水线上修改采样孕周数据问题 * @author 武涛涛 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index b5e28a8..07dc7d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -29,6 +30,9 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -73,6 +77,10 @@ public class BabySieveFacede { @Autowired private BabyService babyService; @Autowired + private MongoTemplate mongoTemplate; + @Autowired + private SmsConfigFacade smsConfigFacade; + @Autowired private UsersService usersService; private static final String XS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/xs_save.do";//秦皇岛 新筛四项样本添加 @@ -82,6 +90,7 @@ public class BabySieveFacede { private static final String MSMS_SAVE = "http://121.22.16.246:8091/MSMS/lyms/msms_save.do";//秦皇岛 串联质谱样本添加 private static final String MSMS_UPDATE = "http://121.22.16.246:8091/MSMS/lyms/msms_update.do";//秦皇岛 串联质谱样本更新 private static final String SEARCHRESULT = "http://121.22.16.246:8091/MSMS/lyms/searchResult.do";//秦皇岛 串联结果查询接口 + public static final String SEND_TIME= PropertiesUtils.getPropertyValue("send_time"); /** * 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录 @@ -222,6 +231,7 @@ public class BabySieveFacede { /** * 初始化机构 列表 + * * @Author: 武涛涛 * @Date: 2020/11/18 8:52 */ @@ -229,6 +239,7 @@ public class BabySieveFacede { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(XsescEnums.init()); } + /** * 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录 秦皇岛版 * @@ -286,7 +297,7 @@ public class BabySieveFacede { babySieveQhdManager.setPhone(pat.getPhone()); babySieveQhdManager.setBirthYMD(DateUtil.getYmd(babyModel.getBirth())); babySieveQhdManager.setBabyName(babyModel.getName()); - if(StringUtils.isNotEmpty(babyModel.getBabyWeight())){ + if (StringUtils.isNotEmpty(babyModel.getBabyWeight())) { Double d = Double.parseDouble(babyModel.getBabyWeight()) * 1000; babySieveQhdManager.setWeight(d.toString());//体重 } @@ -301,7 +312,7 @@ public class BabySieveFacede { } babySieveQhdManager.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));//儿童出生天数 - if(CollectionUtils.isNotEmpty(mList)){ + if (CollectionUtils.isNotEmpty(mList)) { MaternalDeliverModel maternalDeliverModel = mList.get(0); babySieveQhdManager.setDueWeek(maternalDeliverModel.getDueWeek());//分娩孕周 babySieveQhdManager.setMatdeliverId(maternalDeliverModel.getId());//分娩ID @@ -360,8 +371,6 @@ public class BabySieveFacede { } - - /** * 新增或更新一条筛查申请记录 * @@ -428,7 +437,7 @@ public class BabySieveFacede { babySieveQhdService.updateBabySieveById(babySieveQhdModel, babySieveAddQhdRequest.getId()); BabyModel babyModel = convertSieveQhdBaby(babySieveAddQhdRequest, userId, babySieveQhdModel); babyBookbuildingService.updateBabyBuild(babyModel, babySieveQhdModel.getBabyId()); - addOrUpdateBabySc(userId, babySieveQhdModel, hospital,"update"); + addOrUpdateBabySc(userId, babySieveQhdModel, hospital, "update"); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -448,7 +457,7 @@ public class BabySieveFacede { babyModel.setSieveStatuseNw("1"); babyBookbuildingService.updateBabyBuild(babyModel, babySieveQhdModel.getBabyId()); //儿童筛查保存 同步到对方系统 秦皇岛 - addOrUpdateBabySc(userId, babySieveQhdModel, hospital,"add"); + addOrUpdateBabySc(userId, babySieveQhdModel, hospital, "add"); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -461,9 +470,10 @@ public class BabySieveFacede { } } + /** + * 秦皇岛医院自动获取儿童筛查数据状态 * - *秦皇岛医院自动获取儿童筛查数据状态 * @Author: 武涛涛 * @Date: 2020/12/22 13:56 */ @@ -471,10 +481,10 @@ public class BabySieveFacede { Date startDate1 = DateUtil.getDayFirstSecond(new Date()); Date endDate1 = DateUtil.getDayLastSecond(new Date()); System.out.println("start=" + startDate1 + "end=" + endDate1); - babySieveList(startDate1, endDate1,null,null,null,null); + babySieveList(startDate1, endDate1, null, null, null, null); } - public void babySieveList(Date startDate1, Date endDate1,String xsTiaoXingMa,String msTiaoXingMa,String id,String babyId) { + public void babySieveList(Date startDate1, Date endDate1, String xsTiaoXingMa, String msTiaoXingMa, String id, String babyId) { BabySieveQuery babySieveQuery = new BabySieveQuery(); babySieveQuery.setCaiXueTimeStart(startDate1); babySieveQuery.setCaiXueTimeEnd(endDate1); @@ -493,28 +503,28 @@ public class BabySieveFacede { List babySieveQhdModels = babySieveQhdService.getBabySieveQuery(babySieveQuery); System.out.println(babySieveQuery.convertToQuery().convertToMongoQuery()); - for(BabySieveQhdModel babySieveQhdModel:babySieveQhdModels){ + for (BabySieveQhdModel babySieveQhdModel : babySieveQhdModels) { Map map = new HashMap(); - map.put("sign","774856af6fc8bbaaf00705886d512fe2"); + map.put("sign", "774856af6fc8bbaaf00705886d512fe2"); map.put("pid", "1553"); String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId(); - map.put("ssHospital",dshospitalId); + map.put("ssHospital", dshospitalId); // map.put("ssHospital","1623");//测试使用1623 try { //新筛四病 - if(StringUtils.isNotEmpty(babySieveQhdModel.getTestItem())){ + if (StringUtils.isNotEmpty(babySieveQhdModel.getTestItem())) { map.put("tiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); String xs = HttpClientUtil.doGet(XSSEARCHRESULT, map, "utf-8", null); JSONObject jsonObject = JsonUtil.getObj(xs); - if (jsonObject != null && jsonObject.get("state").equals(1)){ + if (jsonObject != null && jsonObject.get("state").equals(1)) { BabySieveQhdModel bSieve = new BabySieveQhdModel(); - JSONObject jsonObjectData = jsonObject.getJSONObject("data"); - if(jsonObjectData!=null){ - if(jsonObjectData.get("positive").equals(0)){ + JSONObject jsonObjectData = jsonObject.getJSONObject("data"); + if (jsonObjectData != null) { + if (jsonObjectData.get("positive").equals(0)) { bSieve.setXscsjg("2");//（1阳性、2阴性 4召回） - }else if(jsonObjectData.get("positive").equals(1)){ + } else if (jsonObjectData.get("positive").equals(1)) { bSieve.setXscsjg("1"); - }else if(jsonObjectData.get("recall_state").equals(1)){ + } else if (jsonObjectData.get("recall_state").equals(1)) { bSieve.setXscsjg("4"); } bSieve.setXsresultJSON(jsonObjectData.toString()); //检查详细存储起来 @@ -523,8 +533,8 @@ public class BabySieveFacede { updateBabyBuildSieve(babySieveQhdModel, bSieve); } - }else { - operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常"); + } else { + operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()), babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "新筛四病结果异常"); } } @@ -533,21 +543,21 @@ public class BabySieveFacede { } try { //串联质谱 MSMS - if(StringUtils.isNotEmpty(babySieveQhdModel.getMsms())){ + if (StringUtils.isNotEmpty(babySieveQhdModel.getMsms())) { map.put("tiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); String xs = HttpClientUtil.doGet(SEARCHRESULT, map, "utf-8", null); JSONObject jsonObject = JsonUtil.getObj(xs); - if (jsonObject != null && jsonObject.get("state").equals(1)){ + if (jsonObject != null && jsonObject.get("state").equals(1)) { BabySieveQhdModel bSieve = new BabySieveQhdModel(); - JSONObject jsonObjectData = jsonObject.getJSONObject("data"); - if(jsonObjectData!=null){ - JSONObject patien = jsonObjectData.getJSONObject("patien"); + JSONObject jsonObjectData = jsonObject.getJSONObject("data"); + if (jsonObjectData != null) { + JSONObject patien = jsonObjectData.getJSONObject("patien"); //串联里面Status2，1正常 2异常 4召回 6临床确诊 - if(patien!=null && patien.get("status2").equals(1)){ + if (patien != null && patien.get("status2").equals(1)) { bSieve.setClcsjg("2"); - }else if(patien!=null && patien.get("status2").equals(2)){ + } else if (patien != null && patien.get("status2").equals(2)) { bSieve.setClcsjg("1"); - }else if(patien!=null && patien.get("status2")!=null){ + } else if (patien != null && patien.get("status2") != null) { bSieve.setClcsjg(patien.get("status2").toString()); } bSieve.setClresultJSON(jsonObjectData.toString()); //检查详细存储起来 @@ -555,8 +565,8 @@ public class BabySieveFacede { babySieveQhdService.updateBabySieveById(bSieve, babySieveQhdModel.getId()); updateBabyBuildSieve(babySieveQhdModel, bSieve); } - }else { - operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()),babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常"); + } else { + operateLogFacade.addModifyOptLog(null, Integer.valueOf(babySieveQhdModel.getHospitalId()), babySieveQhdModel, jsonObject, OptActionEnums.ADD.getId(), "串联质谱结果异常"); } } } catch (NumberFormatException e) { @@ -565,6 +575,79 @@ public class BabySieveFacede { } } + /** + * 儿保出生日期42天后，还没有正式的保存儿童建档，发送一条短信 + * + * @Author: 武涛涛 + * @Date: 2020/12/22 13:56 + */ + public void babyShortMessageQhdTimerWork() { + Date startDate1 = DateUtil.getDayFirstSecond(DateUtil.getBeforeOrAfter(-42)); + Date endDate1 = DateUtil.getDayLastSecond(new Date()); + System.out.println("start=" + startDate1 + "end=" + endDate1); + + babyShortMessageQhdList(startDate1, endDate1, null, null, null, null); + } + + public void babyShortMessageQhdList(Date startDate1, Date endDate1, String xsTiaoXingMa, String msTiaoXingMa, String id, String babyId) { + //查询到新生儿建档提醒有医院，是否有配置此权限 2启用 + ModularFunctionConfigModel functionConfigModel = mongoTemplate.findOne(Query.query(Criteria.where("$where").is(String.format("function(){\n" + + " var configs = this.configs;\n" + + " if(configs!=null){\n" + + " for ( var i = 0; i < configs.length; i++) {\n" + + " if(configs[i] != null ){\n" + + " if( configs[i].type == 99){\n" + + " if( configs[i].value == 2){\n" + + " return true;\n" + + " }\n" + + " \n" + + " }\n" + + " }\n" + + " } \n" + + " }\n" + + " }"))),ModularFunctionConfigModel.class); + //判断是否为开启状态，空的话就是没有权限 + if (null == functionConfigModel) { + return; + } + //1 获取42天前日期，获取满足实际范围并且是当前医院分娩的儿童， yn 0 dataStatus 1, + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setHospitalId(functionConfigModel.getHospitalId()); + babyModelQuery.setBirthStart(startDate1); + babyModelQuery.setBirthEnd(endDate1); + babyModelQuery.setYn(YnEnums.NO.getId()); + babyModelQuery.setDataStatus(true); + List babyList = babyService.queryBabyWithQuery(babyModelQuery); + if (CollectionUtils.isEmpty(babyList)) { + return; + } + List messages = new ArrayList <>(); + for (BabyModel baby : babyList) { + MsgRequest mr = new MsgRequest(); + String content = "您的宝宝已满月，应到具有儿保检查的妇幼医院进行体检，促进宝宝正常发育，已经体检请忽略消息"; + mr.setFirst(content); + mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); + mr.setPhone(baby.getMphone()); + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); + mr.setPlanTime(DateUtil.getyyyy_MM_dd(new Date())+" 16:00:00"); + mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId()); + mr.setHospitalId(baby.getHospitalId()); + mr.setPatientId(baby.getId()); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setSmsStatus(SmsStatusEnums.WFS.getId()); + mr.setServiceType(2); + messages.add(mr); + ExceptionUtils.catchException("baby build msg = " + mr); + + } + if (CollectionUtils.isNotEmpty(messages)) { + smsConfigFacade.saveMsg(messages, null); //查看发送短信列表是否有该信息。 + } + + } + private void updateBabyBuildSieve(BabySieveQhdModel babySieveQhdModel, BabySieveQhdModel bSieve) { BabyModel model = new BabyModel(); model.setXscsjg(bSieve.getXscsjg()); @@ -588,45 +671,45 @@ public class BabySieveFacede { map.put("pid", "1553"); map.put("momName", babySieveQhdModel.getMomName()); String dshospitalId = XsescEnums.getYchospitalId(babySieveQhdModel.getSsHospital()).getDshospitalId(); - map.put("ssHospital",dshospitalId); + map.put("ssHospital", dshospitalId); // map.put("ssHospital","1623");//测试使用1623 - map.put("phone",babySieveQhdModel.getPhone()); + map.put("phone", babySieveQhdModel.getPhone()); map.put("zhuYuanNum", babySieveQhdModel.getZhuYuanNum()); map.put("buruSum", babySieveQhdModel.getBuruSum()); String yunZhou1 = "0"; String yunZhou_tian = "0"; - if(StringUtils.isNotEmpty(babySieveQhdModel.getYunZhou())){ + if (StringUtils.isNotEmpty(babySieveQhdModel.getYunZhou())) { String yunZhou = babySieveQhdModel.getYunZhou(); yunZhou1 = yunZhou.contains("周") ? yunZhou.substring(0, yunZhou.indexOf("周")) : "0";//39周+4天 - yunZhou_tian = yunZhou.contains("天") ? yunZhou.substring(yunZhou.indexOf("+")+1, yunZhou.indexOf("天")) : "0"; + yunZhou_tian = yunZhou.contains("天") ? yunZhou.substring(yunZhou.indexOf("+") + 1, yunZhou.indexOf("天")) : "0"; } - map.put("yunZhou",yunZhou1); - map.put("yunZhou_tian",yunZhou_tian); - map.put("sex", "1".equals(babySieveQhdModel.getSex())?"男":("0".equals(babySieveQhdModel.getSex())?"女":"不明")); + map.put("yunZhou", yunZhou1); + map.put("yunZhou_tian", yunZhou_tian); + map.put("sex", "1".equals(babySieveQhdModel.getSex()) ? "男" : ("0".equals(babySieveQhdModel.getSex()) ? "女" : "不明")); map.put("bornTime", DateUtil.getyyyy_MM_dd(babySieveQhdModel.getBornTime())); map.put("caiXueTime", DateUtil.getyyyy_MM_dd(babySieveQhdModel.getCaiXueTime())); - if(babySieveQhdModel.getWeight().contains(".0")){ - map.put("weight",babySieveQhdModel.getWeight().substring(0,babySieveQhdModel.getWeight().indexOf(".0"))); - }else { + if (babySieveQhdModel.getWeight().contains(".0")) { + map.put("weight", babySieveQhdModel.getWeight().substring(0, babySieveQhdModel.getWeight().indexOf(".0"))); + } else { map.put("weight", babySieveQhdModel.getWeight()); } map.put("address", babySieveQhdModel.getAddress()); map.put("householdNature", babySieveQhdModel.getHouseholdNature()); - map.put("householdType", babySieveQhdModel.getHouseholdType()); - if("2".equals(babySieveQhdModel.getPay_type())){//（1 自费、2 免费） + map.put("householdType", babySieveQhdModel.getHouseholdType()); + if ("2".equals(babySieveQhdModel.getPay_type())) {//（1 自费、2 免费） map.put("pay_type", "free");//默认 dis_free 自费 free 免费 - }else{ + } else { map.put("pay_type", "dis_free"); } map.put("idcard", babySieveQhdModel.getIdcard()); - if("add".equals(state)){ - if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){ + if ("add".equals(state)) { + if (StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())) { map.put("testItem", babySieveQhdModel.getTestItem()); map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); String xs = HttpClientUtil.doGet(XS_SAVE, map, "utf-8", null); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.ADD.getId(), "保存儿童筛查新筛四项"); } - if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){ + if (StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())) { map.put("msms", babySieveQhdModel.getMsms()); map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); map.remove("testItem"); @@ -634,13 +717,13 @@ public class BabySieveFacede { String cl = HttpClientUtil.doGet(MSMS_SAVE, map, "utf-8", null); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, cl, OptActionEnums.ADD.getId(), "保存儿童筛查串联质谱样"); } - }else if("update".equals(state)){ - if(StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())){ + } else if ("update".equals(state)) { + if (StringUtils.isNotEmpty(babySieveQhdModel.getXsTiaoXingMa())) { map.put("xsTiaoXingMa", babySieveQhdModel.getXsTiaoXingMa()); String xs = HttpClientUtil.doGet(XS_UPDATE, map, "utf-8", null); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospital), map, xs, OptActionEnums.UPDATE.getId(), "修改儿童筛查新筛四项"); } - if(StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())){ + if (StringUtils.isNotEmpty(babySieveQhdModel.getMsTiaoXingMa())) { map.put("msTiaoXingMa", babySieveQhdModel.getMsTiaoXingMa()); map.remove("xsTiaoXingMa"); String cl = HttpClientUtil.doGet(MSMS_UPDATE, map, "utf-8", null); @@ -649,8 +732,6 @@ public class BabySieveFacede { } - - } /** @@ -891,13 +972,13 @@ public class BabySieveFacede { e.printStackTrace(); } } - if(StringUtils.isNotEmpty(babySieveAddQhdRequest.getTestItem()) ){ + if (StringUtils.isNotEmpty(babySieveAddQhdRequest.getTestItem())) { String testItem = babySieveAddQhdRequest.getTestItem(); String substring1 = testItem.substring(testItem.length() - 1, testItem.length()); - if(",".equals(substring1) && babySieveAddQhdRequest.getTestItem().contains(",")){ + if (",".equals(substring1) && babySieveAddQhdRequest.getTestItem().contains(",")) { String substring = babySieveAddQhdRequest.getTestItem().substring(0, babySieveAddQhdRequest.getTestItem().length() - 1); - babyModelQuery.setTestItem(testItem.substring(0, testItem.length()-1)); - }else { + babyModelQuery.setTestItem(testItem.substring(0, testItem.length() - 1)); + } else { //新筛四病 babyModelQuery.setTestItem(babySieveAddQhdRequest.getTestItem()); } @@ -1039,8 +1120,6 @@ public class BabySieveFacede { } - - /** * 修改申请单状态（新筛实验室接收按钮） * 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 117f529..9eeb9eb 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -146,6 +146,16 @@ + + + + + + + + + + @@ -245,6 +255,13 @@ + + + + + + + @@ -561,6 +578,7 @@ + -- 1.8.3.1