diff --git a/src/main/java/com/ynxbd/common/TestA.java b/src/main/java/com/ynxbd/common/TestA.java index 6908ff0..8d3a156 100644 --- a/src/main/java/com/ynxbd/common/TestA.java +++ b/src/main/java/com/ynxbd/common/TestA.java @@ -1,10 +1,16 @@ package com.ynxbd.common; +import com.ynxbd.common.bean.Doctor; import com.ynxbd.common.bean.Patient; import com.ynxbd.common.bean.enums.MerchantEnum; import com.ynxbd.common.helper.common.HMACHelper; +import com.ynxbd.common.helper.common.JsonHelper; import com.ynxbd.common.result.JsonResult; import com.ynxbd.common.result.JsonResultEnum; +import com.ynxbd.common.service.DoctorService; +import com.ynxbd.wx.wxfactory.AesWxHelper; + +import java.util.List; public class TestA { @@ -37,7 +43,7 @@ public class TestA { // } - public static void main(String[] args) { +// public static void main(String[] args) { // String respXML = "\n" + // "\t1002\n" + // "\t0\n" + @@ -52,7 +58,18 @@ public class TestA { // } // Patient patient = result.dataMapToBean(Patient.class); // System.out.println(patient); - } +// } + + +// public static void main(String[] args) { +// System.out.println(AesWxHelper.encode("524404")); +// +// String dataJson = "[{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":3,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":3,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":3,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"},{\"deptCode\":\"94085\",\"deptName\":\"便民门诊\",\"description\":\"医师\",\"surplusSources\":4,\"title\":\"医师\",\"titleCode\":\"医师\"}]\n"; +// +// List doctors = JsonHelper.parseArray(dataJson, Doctor.class); +// doctors = new DoctorService().doctorListFilter(doctors); +// System.out.println(doctors); +// } } diff --git a/src/main/java/com/ynxbd/common/action/PatientAction.java b/src/main/java/com/ynxbd/common/action/PatientAction.java index 8a1a39e..4c900dc 100644 --- a/src/main/java/com/ynxbd/common/action/PatientAction.java +++ b/src/main/java/com/ynxbd/common/action/PatientAction.java @@ -417,10 +417,13 @@ public class PatientAction extends BaseAction { return Result.success(); } - // http://127.0.0.1:8080/wx/patient/queryGMCId?hisPatientId=5C881337931CDBBC8D38FACAE2D302D8 - @Action("queryGMCId") - public Result queryGMCId(@AesDecode String hisPatientId) { - String gmcPatientId = new HisPatientDao().getGMCEmpiId(hisPatientId); - return Result.success(gmcPatientId); + // http://127.0.0.1:8080/wx/patient/getGMCEmpiId?hisPatientId=5C881337931CDBBC8D38FACAE2D302D8 + @Action("getGMCEmpiId") + public Result getGMCEmpiId(@AesDecode String hisPatientId) { + String empiId = new HisPatientDao().getGMCEmpiId(hisPatientId); + if (ObjectUtils.isEmpty(empiId)) { + return Result.error(ResultEnum.DATA_NOT_FOUND); + } + return Result.success(empiId); } } diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java index 32e7142..837ddb9 100644 --- a/src/main/java/com/ynxbd/common/action/RegisterAction.java +++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java @@ -13,7 +13,6 @@ import com.ynxbd.common.helper.common.DateHelper; import com.ynxbd.common.result.JsonResult; import com.ynxbd.common.result.Result; import com.ynxbd.common.result.ResultEnum; -import com.ynxbd.common.result.ServiceException; import com.ynxbd.common.service.DoctorService; import com.ynxbd.common.service.MedToolService; import com.ynxbd.common.service.PatientService; diff --git a/src/main/resources/webservice.properties b/src/main/resources/webservice.properties index fb062b6..d20bfa9 100644 --- a/src/main/resources/webservice.properties +++ b/src/main/resources/webservice.properties @@ -1 +1 @@ -# \u5F00\u542F\u5904\u65B9\u9884\u7ED3\u7B97\uFF08\u7B2C2\u5F00\u5173\uFF09\uFF08\u6CE8\u610F\u8BE5\u914D\u7F6E\u9700\u8054\u7CFBhis\u5F00\u53D1\u8005\u786E\u8BA4\u652F\u6301\u624D\u80FD\u5F00\u542F\uFF0C\u5426\u5219\u5B58\u5728\u98CE\u9669\uFF01\uFF09 his.is_recipe_prepay=false # \u672C\u5730 #his.url=127.0.0.1:8888 # HIS\u662F\u5426\u5F00\u542F\u652F\u4ED8\u5B9D\u5206\u5F00\u5BF9\u8D26 his.is_ali_mer=false # \u662F\u5426\u5F3A\u5236\u6253\u5370webservice\u7684xml\u8FD4\u56DE\u6570\u636E his.is_log_resp=false # \u5DDE\u50A3\u533B\u4F7F\u7528 his.is_req_cdata=false # \u662F\u5426\u4F20\u9012openid\u7ED9his\u63A8\u9001\u6D88\u606F his.is_push_msg=false #------------------------------- # \u6D4B\u8BD5\u73AF\u5883 his.dev_url=200.200.200.105:8888 # \u533B\u4FDD=========================== # \u65E7\u914D\u7F6E his.md_url=127.0.0.1:7777 # \u5FAE\u4FE1\u533B\u4FDD his.wx_med_url=10.20.10.7:7885 # \u652F\u4ED8\u5B9D\u533B\u4FDD his.ali_med_url=10.20.10.7:7885 # \u516C\u53F8\u6D4B\u8BD5 #his.url=192.168.12.10:8888 # \u77F3\u6797\u6D4B\u8BD5 #his.url=200.200.200.105:8888 # \u6D4B\u8BD5============================================================ # \u5FB7\u5B8F\u4E2D\u533B #his.url=200.200.200.60:9999 # \u7EA2\u6CB3\u5DDE\u533B\u9662 #his.url=10.20.10.6:8888 # \u8292\u5E02\u5987\u5E7C #his.url=192.168.11.7:8888 # \u5B81\u8497\u5987\u5E7C #his.url=172.19.3.15:8888 # \u5B81\u8497\u53BF\u533B\u9662 #his.url=192.168.10.8:8888 # \u516C\u53F8\u6D4B\u8BD5 #his.url=192.168.12.39:8888 #\u666F\u6D2A\u4E2D\u50A3\u533B his.url=192.168.197.217:8888 # \u516C\u53F8\u6D4B\u8BD5 #his.url=192.168.12.10:8888 # \u7EA2\u6CB3 #his.url=10.20.10.6:8888 # \u7EA2\u6CB3\u533B\u4FDD #his.url=10.20.10.6:8888 #his.url=192.168.12.10:8888 #his.md_url=192.168.1.128:7885 #his.dev_url=10.20.10.6:9988 # \u6C38\u80DC #his.url=200.200.200.20:8888 # \u5FB7\u5B8F\u4E2D\u533B #his.url=200.200.200.60:8888 # \u534E\u576A #his.url=192.168.1.115:8888 # \u8499\u81EA\u4E2D\u533B #his.url=192.168.0.228:8888 # \u7389\u9F99 #his.url=192.168.0.17:8888 # #his.url=172.16.10.15:8888 # \u7984\u529D\u949F\u7231 #his.url=200.200.200.5:8888 # \u8499\u81EA\u5E02\u4EBA\u6C11\u533B\u9662 #his.url=200.200.200.174:8080 # \u5143\u8C0B #his.url=200.200.200.29:8888 # \u5143\u8C0B\u533B\u4FDD #his.dev_url=200.200.200.36:9999 # \u8292\u5E02 #his.url=192.168.100.8:8888 # \u7EA2\u6CB3\u5987\u5E7C\u4FDD\u5065\u9662 #his.url=192.168.1.204:8888 # \u8292\u5E02\u5987\u5E7C #his.url=192.168.11.7:8888 # #his.url=10.10.11.23:8888 # \u77F3\u6797 #his.url=192.168.10.10:8888 # \u5BCC\u6C11 #his.url=200.200.201.27:8888 # \u897F\u53CC\u7248\u7EB3 #his.url=10.10.11.23:8888 #wx.password=ynxbd@6910 \ No newline at end of file +# \u5F00\u542F\u5904\u65B9\u9884\u7ED3\u7B97\uFF08\u7B2C2\u5F00\u5173\uFF09\uFF08\u6CE8\u610F\u8BE5\u914D\u7F6E\u9700\u8054\u7CFBhis\u5F00\u53D1\u8005\u786E\u8BA4\u652F\u6301\u624D\u80FD\u5F00\u542F\uFF0C\u5426\u5219\u5B58\u5728\u98CE\u9669\uFF01\uFF09 his.is_recipe_prepay=false # \u672C\u5730 #his.url=127.0.0.1:8888 # HIS\u662F\u5426\u5F00\u542F\u652F\u4ED8\u5B9D\u5206\u5F00\u5BF9\u8D26 his.is_ali_mer=false # \u662F\u5426\u5F3A\u5236\u6253\u5370webservice\u7684xml\u8FD4\u56DE\u6570\u636E his.is_log_resp=false # \u5DDE\u50A3\u533B\u4F7F\u7528 his.is_req_cdata=false # \u662F\u5426\u4F20\u9012openid\u7ED9his\u63A8\u9001\u6D88\u606F his.is_push_msg=false #------------------------------- # \u6D4B\u8BD5\u73AF\u5883 his.dev_url=200.200.200.105:8888 # \u533B\u4FDD=========================== # \u65E7\u914D\u7F6E his.md_url=127.0.0.1:7777 # \u5FAE\u4FE1\u533B\u4FDD his.wx_med_url=10.20.10.7:7885 # \u652F\u4ED8\u5B9D\u533B\u4FDD his.ali_med_url=10.20.10.7:7885 # \u6D4B\u8BD5============================================================ # \u516C\u53F8\u6D4B\u8BD5 #his.url=192.168.12.10:8888 # \u77F3\u6797\u53BF\u533B\u9662 his.url=200.200.200.105:8888 # \u5FB7\u5B8F\u4E2D\u533B #his.url=200.200.200.60:9999 # \u7EA2\u6CB3\u5DDE\u533B\u9662 #his.url=10.20.10.6:8888 # \u8292\u5E02\u5987\u5E7C #his.url=192.168.11.7:8888 # \u5B81\u8497\u5987\u5E7C #his.url=172.19.3.15:8888 # \u5B81\u8497\u53BF\u533B\u9662 #his.url=192.168.10.8:8888 # \u516C\u53F8\u6D4B\u8BD5 #his.url=192.168.12.39:8888 #\u666F\u6D2A\u4E2D\u50A3\u533B #his.url=192.168.197.217:8888 # \u516C\u53F8\u6D4B\u8BD5 #his.url=192.168.12.10:8888 # \u7EA2\u6CB3 #his.url=10.20.10.6:8888 # \u7EA2\u6CB3\u533B\u4FDD #his.url=10.20.10.6:8888 #his.url=192.168.12.10:8888 #his.md_url=192.168.1.128:7885 #his.dev_url=10.20.10.6:9988 # \u6C38\u80DC #his.url=200.200.200.20:8888 # \u5FB7\u5B8F\u4E2D\u533B #his.url=200.200.200.60:8888 # \u534E\u576A #his.url=192.168.1.115:8888 # \u8499\u81EA\u4E2D\u533B #his.url=192.168.0.228:8888 # \u7389\u9F99 #his.url=192.168.0.17:8888 # #his.url=172.16.10.15:8888 # \u7984\u529D\u949F\u7231 #his.url=200.200.200.5:8888 # \u8499\u81EA\u5E02\u4EBA\u6C11\u533B\u9662 #his.url=200.200.200.174:8080 # \u5143\u8C0B #his.url=200.200.200.29:8888 # \u5143\u8C0B\u533B\u4FDD #his.dev_url=200.200.200.36:9999 # \u8292\u5E02 #his.url=192.168.100.8:8888 # \u7EA2\u6CB3\u5987\u5E7C\u4FDD\u5065\u9662 #his.url=192.168.1.204:8888 # \u8292\u5E02\u5987\u5E7C #his.url=192.168.11.7:8888 # #his.url=10.10.11.23:8888 # \u77F3\u6797 #his.url=192.168.10.10:8888 # \u5BCC\u6C11 #his.url=200.200.201.27:8888 # \u897F\u53CC\u7248\u7EB3 #his.url=10.10.11.23:8888 #wx.password=ynxbd@6910 \ No newline at end of file