From f79aca5a1910aac35eee6b2e3c1af429815cc549 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 13 Oct 2017 14:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=99=A2=E6=8F=90=E9=86=92=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatientMarkHospitalController.java | 2 +- .../web/controller/PatientServiceController.java | 17 --------- .../operate/web/controller/SyncDataController.java | 40 ++++++++++++++++++---- .../operate/web/facade/BabyBookbuildingFacade.java | 6 ++++ .../web/facade/PatientMarkHospServiceFacade.java | 13 ++++--- .../web/facade/PatientServiceSysFacade.java | 9 ++++- .../platform/operate/web/facade/SysBaseFacade.java | 2 +- 7 files changed, 58 insertions(+), 31 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java index c227a0c..d9bda2a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java @@ -56,7 +56,7 @@ public class PatientMarkHospitalController extends BaseController { } /** - * 回院提统计 + * 回院提醒统计 * @param request * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 819474f..5abb97a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -8,14 +8,11 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.PatientServiceFacade; -import com.lyms.platform.operate.web.facade.SysBaseFacade; import com.lyms.platform.operate.web.request.BasePageQueryRequest; import com.lyms.platform.permission.model.PatientService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.ContextLoader; -import org.springframework.web.context.WebApplicationContext; import javax.servlet.http.HttpServletRequest; import java.util.Date; @@ -32,20 +29,6 @@ public class PatientServiceController extends BaseController { private PatientServiceFacade patientServiceFacade; /** - * 小程序同步数据接口 - * - * @return - */ - @ResponseBody - @RequestMapping(value = "/patSer/sysnPatientSer", method = RequestMethod.POST) - public BaseResponse sysnPatientSer(){ - String action = "patientServiceSysFacade"; - WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext(); - SysBaseFacade sysBaseFacade = (SysBaseFacade)webApplicationContext.getBean(action); - return sysBaseFacade.sysData(); - } - - /** * 初始化接口 * * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index bf5c0f6..695c98b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -2,9 +2,14 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.biz.service.SyncDataService; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.pojo.SyncDataModel; -import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.request.BabyCheckRequest; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.Config; +import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.LymsEncodeUtil; +import com.lyms.platform.operate.web.facade.SysBaseFacade; import com.lyms.platform.operate.web.request.SqlRequest; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.query.SyncDataQuery; @@ -12,10 +17,9 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.ContextLoader; +import org.springframework.web.context.WebApplicationContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -37,6 +41,30 @@ public class SyncDataController extends BaseController { public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); + /** + * 小程序同步数据接口 + * + * @return + */ + @ResponseBody + @RequestMapping(value = "/sysnDataSer", method = RequestMethod.POST) + public BaseResponse sysnDataSer( + @RequestParam(value = "action", required = true) String action, + @RequestParam(value = "synForm", required = true) String synForm + ){ + try{ + WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext(); + SysBaseFacade sysBaseFacade = (SysBaseFacade)webApplicationContext.getBean(action); + return sysBaseFacade.sysData(synForm); + }catch (Exception e){ + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(e.getMessage()); + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return baseResponse; + } + } + @RequestMapping(value = "/findSyncData", method = RequestMethod.POST) public void findSyncData(HttpServletResponse response) { SyncDataQuery syncDataQuery = new SyncDataQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 93e8f5c..03562b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1326,6 +1326,12 @@ public class BabyBookbuildingFacade { { if(org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())){ Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); + try{ + + }catch (Exception e){ + + } + if (org != null) { result.setDeliverOrg(org.getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 403be1b..6a56d5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -120,6 +120,13 @@ public class PatientMarkHospServiceFacade { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); + + //住院预约总数 + int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery); + patientMarkHospQuery.setBackStatus(1); + //回院待提醒数 + int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery); + patientMarkHospQuery.setHospitalId(hospitalId); patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate()); patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate()); @@ -137,11 +144,7 @@ public class PatientMarkHospServiceFacade { //统计数据 List reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByBackDoctor(patientMarkHospQuery); - //住院预约总数 - int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery); - patientMarkHospQuery.setBackStatus(1); - //回院待提醒数 - int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery); + //列数据 List legendData = new ArrayList<>(); List> serData = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index 50cd5fb..11138c8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.permission.model.PatientService; +import net.sf.json.JSONObject; import org.springframework.stereotype.Component; /** @@ -11,10 +13,15 @@ import org.springframework.stereotype.Component; @Component public class PatientServiceSysFacade implements SysBaseFacade{ @Override - public BaseResponse sysData() { + public BaseResponse sysData(String synForm) { + JSONObject jsonObject = JSONObject.fromObject(synForm); + PatientService patientService = (PatientService)JSONObject.toBean(jsonObject, PatientService.class); + + System.out.println("同步数据方法"); BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(0); + baseResponse.setObject(synForm); baseResponse.setErrormsg("成功"); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java index 113d874..aeb2f65 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java @@ -8,5 +8,5 @@ import com.lyms.platform.common.result.BaseResponse; * @discription */ public interface SysBaseFacade { - public BaseResponse sysData(); + public BaseResponse sysData(String synForm); } -- 1.8.3.1