From 2a8318590df79088582031e6a68209146790d370 Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 30 Sep 2019 08:29:27 +0800 Subject: [PATCH] =?UTF-8?q?B=E8=B6=85+=E5=8A=A0=E5=AF=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/TestController.java | 17 ++++++++----- .../web/facade/AntenatalExaminationFacade.java | 28 ++++++++++++++++++---- 2 files changed, 34 insertions(+), 11 deletions(-) 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 f002c15..3e38e52 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 @@ -20,10 +20,7 @@ import com.lyms.platform.common.enums.SieveStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.CompressEncodeingUtil; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExceptionUtils; -import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.request.AntExListQueryRequest; import com.lyms.platform.operate.web.result.HighScoreResult; @@ -3330,7 +3327,7 @@ public class TestController extends BaseController { * 根据传入的卡的id来计算解密卡号的密码 * @param kid * @return - */ + @RequestMapping(value = "/qhd/getVcCardNoPwd", method = RequestMethod.GET) @ResponseBody public String getVcCardNoPwd(@RequestParam(required = true) String kid) @@ -3345,6 +3342,14 @@ public class TestController extends BaseController { e.printStackTrace(); } return ""; + }*/ + @RequestMapping(value = "/qhd/getVcCardNoPwd", method = RequestMethod.GET) + @ResponseBody + public String getVcCardNoPwd(@RequestParam(required = true) String kid) + { + Map map = new HashMap(); + map.put("kid",kid); + String s = HttpClientUtil.doGet("http://localhost:9090/qhd/getVcCardNoPwd", map, "utf-8", null); + return s; } - } 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 b6ba541..a5fb7f1 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 @@ -2229,6 +2229,15 @@ public class AntenatalExaminationFacade { public static String getDateAfter(Date d,int day){ Calendar now =Calendar.getInstance(); now.setTime(d); + now.set(Calendar.DATE,now.get(Calendar.DATE)+day); + + String strDateFormat = "yyyy-MM-dd"; + SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + return sdf.format(now.getTime()); + } + public static String getDateOther(Date d,int day){ + Calendar now =Calendar.getInstance(); + now.setTime(d); now.set(Calendar.DATE,now.get(Calendar.DATE)-day); String strDateFormat = "yyyy-MM-dd"; @@ -2252,8 +2261,14 @@ public class AntenatalExaminationFacade { } public void bChaoTimerWork() { - String startDate1 = getDateAfter(new Date(), 1); - String endDate1 = DateUtil.getyyyy_MM_dd(new Date()); + /* + 需求： + 初诊B超数据一般在初诊后两天内产生结果，要求将B超结果出来更新初诊B超数据值。 + + 获取当前时间的前两天初诊数据，进行定时处理初诊数据B超信息修改。 + */ + 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); } @@ -2285,7 +2300,9 @@ public class AntenatalExaminationFacade { 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) { @@ -2297,8 +2314,9 @@ public class AntenatalExaminationFacade { String s = null; String vcCardNo = patients.getVcCardNo(); Map map = new HashMap(); - String startDate1 = getDateAfter(checkTime, 1); - String endDate1 = DateUtil.getyyyy_MM_dd(checkTime); + + String startDate1 = DateUtil.getyyyy_MM_dd(checkTime); + String endDate1 = getDateAfter(checkTime, 2); map.put("vcCardNo", vcCardNo); map.put("startDate", startDate1); map.put("endDate", endDate1); -- 1.8.3.1