diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 91a3211..0e7e52b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -60,7 +60,7 @@ public class AntenatalExaminationController extends BaseController { private PatientCheckTicketService checkTicketService; public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); - public static final String INTERFACE_VERSION=PropertiesUtils.getPropertyValue("interface_version"); + @Autowired private AutoMatchFacade autoMatchFacade; @@ -107,6 +107,8 @@ public class AntenatalExaminationController extends BaseController { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(qhdfyHisService.queryCheckListupdate(cardNo, ftype)); } else if ("6".equals(HIS_VERSION)) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(dzfyHisService.queryCheckListupdate(cardNo, ftype)); + } else if ("7".equals(HIS_VERSION)){ + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(nczxyyLisService.queryCheckListupdate(cardNo, ftype)); } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据"); @@ -114,18 +116,6 @@ public class AntenatalExaminationController extends BaseController { } - @RequestMapping(method = RequestMethod.GET, value = "/lisinterfacechecklistbydate") - @ResponseBody - public BaseResponse queryHisCheckList3(String cardNo, int ftype,HttpServletRequest request){ - if("1".equals(INTERFACE_VERSION)){ - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(nczxyyLisService.queryCheckListupdate(cardNo, ftype)); - }else { - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据"); - - } - } - - /** * 查询产前检查 diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 048c1ce..978f317 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -12,11 +12,9 @@ center_token=e0c56363-00d6-42ee-bbe0-23c553583062 shanDong_Dezhou_youHuiQuan_money_Number=500 -#调用医院的接口 0:未使用,1:四川南充中心医院 -interface_version=1 -#His系统版本 0:未使用,1:桓台,2:新乐,3:青龙县医院,4:秦皇岛妇幼,5:抚宁妇幼, 6: 德州妇幼 -his_version=0 +#His系统版本 0:未使用,1:桓台,2:新乐,3:青龙县医院,4:秦皇岛妇幼,5:抚宁妇幼, 6: 德州妇幼,7:南充中心医院 +his_version=7 #统计中心url center_statistics_url=http://api.healthbaby.com.cn/ @@ -74,6 +72,13 @@ jdbc.6.url=jdbc:oracle:thin:@119.90.57.26:1522:orcl jdbc.6.username=LYMS_ODS jdbc.6.password=Welcome1 + +jdbc.7.driver=oracle.jdbc.driver.OracleDriver +jdbc.7.url=jdbc:oracle:thin:@119.90.57.26:1522:orcl +jdbc.7.username=LYMS_ODS +jdbc.7.password=Welcome1 + + # 远程调用类型 1=本地 2=测试环境 3=线上环境 remote.url.type=2 platform.operate.api.1.url=http://localhost:9091/