diff --git a/platform-mommyData/pom.xml b/platform-mommyData/pom.xml
index 4730d91..1b990f9 100644
--- a/platform-mommyData/pom.xml
+++ b/platform-mommyData/pom.xml
@@ -16,11 +16,6 @@
platform-common
1.0.1
-
- com.oracle
- ojdbc14
- 11.2.0.1.0
-
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java
new file mode 100644
index 0000000..d0773c7
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java
@@ -0,0 +1,181 @@
+package com.lyms.hospitalapi.pojo;
+
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ * 字段名称 字段类型 字段描述
+ P_APPLICATIONNUM VARCHAR2 申请号
+ P_CARD VARCHAR2 卡号
+ P_BEDNUN VARCHAR2 床位代码
+ P_CHECKDEPARTNAME VARCHAR2 检查科室名称
+ P_ENDEMICNAME VARCHAR2 病区名称
+ P_AGE VARCHAR2 年龄
+ P_NAME VARCHAR2 患者姓名
+ P_SEX VARCHAR2 性别 数字或者汉字均可，0，女；1，男
+ P_ADMISSIONNUM VARCHAR2 住院号
+ P_REPORTTYPENAME VARCHAR2 报告类别名称
+ P_REPORTISSUETIME date 报告发布时间
+ P_APPLATIONTIME date 申请时间
+ P_REPORTTIME date 报告时间
+ P_CHECKTIME date 检查时间
+ P_APPLATIONDOCNAME VARCHAR2 申请医生名称
+ STATUS NUMBER 1:申请中,2:检查中,3:诊断完成
+ MODIFIED DATE 最后修改时间
+ */
+public class LisCheckInfo {
+
+ private String P_APPLICATIONNUM;
+ private String P_CARD;
+ private String P_BEDNUN;
+ private String P_CHECKDEPARTNAME;
+ private String P_ENDEMICNAME;
+ private String P_AGE;
+ private String P_NAME;
+ private String P_SEX;
+ private String P_ADMISSIONNUM;
+ private String P_REPORTTYPENAME;
+ private String P_APPLATIONDOCNAME;
+ private Date P_REPORTISSUETIME;
+ private Date P_APPLATIONTIME;
+ private Date P_REPORTTIME;
+ private Date P_CHECKTIME;
+ private Date MODIFIED;
+ private Integer STATUS;
+
+ public String getP_APPLICATIONNUM() {
+ return P_APPLICATIONNUM;
+ }
+
+ public void setP_APPLICATIONNUM(String p_APPLICATIONNUM) {
+ P_APPLICATIONNUM = p_APPLICATIONNUM;
+ }
+
+ public String getP_CARD() {
+ return P_CARD;
+ }
+
+ public void setP_CARD(String p_CARD) {
+ P_CARD = p_CARD;
+ }
+
+ public String getP_BEDNUN() {
+ return P_BEDNUN;
+ }
+
+ public void setP_BEDNUN(String p_BEDNUN) {
+ P_BEDNUN = p_BEDNUN;
+ }
+
+ public String getP_CHECKDEPARTNAME() {
+ return P_CHECKDEPARTNAME;
+ }
+
+ public void setP_CHECKDEPARTNAME(String p_CHECKDEPARTNAME) {
+ P_CHECKDEPARTNAME = p_CHECKDEPARTNAME;
+ }
+
+ public String getP_ENDEMICNAME() {
+ return P_ENDEMICNAME;
+ }
+
+ public void setP_ENDEMICNAME(String p_ENDEMICNAME) {
+ P_ENDEMICNAME = p_ENDEMICNAME;
+ }
+
+ public String getP_AGE() {
+ return P_AGE;
+ }
+
+ public void setP_AGE(String p_AGE) {
+ P_AGE = p_AGE;
+ }
+
+ public String getP_NAME() {
+ return P_NAME;
+ }
+
+ public void setP_NAME(String p_NAME) {
+ P_NAME = p_NAME;
+ }
+
+ public String getP_SEX() {
+ return P_SEX;
+ }
+
+ public void setP_SEX(String p_SEX) {
+ P_SEX = p_SEX;
+ }
+
+ public String getP_ADMISSIONNUM() {
+ return P_ADMISSIONNUM;
+ }
+
+ public void setP_ADMISSIONNUM(String p_ADMISSIONNUM) {
+ P_ADMISSIONNUM = p_ADMISSIONNUM;
+ }
+
+ public String getP_REPORTTYPENAME() {
+ return P_REPORTTYPENAME;
+ }
+
+ public void setP_REPORTTYPENAME(String p_REPORTTYPENAME) {
+ P_REPORTTYPENAME = p_REPORTTYPENAME;
+ }
+
+ public String getP_APPLATIONDOCNAME() {
+ return P_APPLATIONDOCNAME;
+ }
+
+ public void setP_APPLATIONDOCNAME(String p_APPLATIONDOCNAME) {
+ P_APPLATIONDOCNAME = p_APPLATIONDOCNAME;
+ }
+
+ public Date getP_REPORTISSUETIME() {
+ return P_REPORTISSUETIME;
+ }
+
+ public void setP_REPORTISSUETIME(Date p_REPORTISSUETIME) {
+ P_REPORTISSUETIME = p_REPORTISSUETIME;
+ }
+
+ public Date getP_APPLATIONTIME() {
+ return P_APPLATIONTIME;
+ }
+
+ public void setP_APPLATIONTIME(Date p_APPLATIONTIME) {
+ P_APPLATIONTIME = p_APPLATIONTIME;
+ }
+
+ public Date getP_REPORTTIME() {
+ return P_REPORTTIME;
+ }
+
+ public void setP_REPORTTIME(Date p_REPORTTIME) {
+ P_REPORTTIME = p_REPORTTIME;
+ }
+
+ public Date getP_CHECKTIME() {
+ return P_CHECKTIME;
+ }
+
+ public void setP_CHECKTIME(Date p_CHECKTIME) {
+ P_CHECKTIME = p_CHECKTIME;
+ }
+
+ public Date getMODIFIED() {
+ return MODIFIED;
+ }
+
+ public void setMODIFIED(Date MODIFIED) {
+ this.MODIFIED = MODIFIED;
+ }
+
+ public Integer getSTATUS() {
+ return STATUS;
+ }
+
+ public void setSTATUS(Integer STATUS) {
+ this.STATUS = STATUS;
+ }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java
new file mode 100644
index 0000000..39812b3
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java
@@ -0,0 +1,141 @@
+package com.lyms.hospitalapi.pojo;
+
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ * 字段名称 字段类型 字段描述
+ P_APPLICATIONNUM VARCHAR2 申请单号，与化验列表的申请单号关联
+ P_HIGHANDLOWMARK VARCHAR2 高低标志
+ P_ITEMCODE VARCHAR2 项目代码
+ P_ITEMNAME VARCHAR2 项目名称
+ P_REFERENCEVALUE VARCHAR2 参考值
+ P_FIGURERESULT VARCHAR2 数字结果
+ P_CODERESULT VARCHAR2 字符结果
+ P_REPORTTIME date 报告时间
+ P_RESULTTYPE VARCHAR2 结果类型
+ P_ITEMRESULT VARCHAR2 项目结果
+ P_UNIT VARCHAR2 单位
+ P_PRINTORDER number 打印顺序
+ P_PRINTGROUP number 打印分组
+ */
+public class LisCheckResult {
+
+ private String P_APPLICATIONNUM;
+ private String P_HIGHANDLOWMARK;
+ private String P_ITEMCODE;
+ private String P_ITEMNAME;
+ private String P_REFERENCEVALUE;
+ private String P_FIGURERESULT;
+ private String P_RESULTTYPE;
+ private String P_ITEMRESULT;
+ private String P_UNIT;
+ private String P_CODERESULT;
+ private Date P_REPORTTIME;
+ private Integer P_PRINTORDER;
+ private Integer P_PRINTGROUP;
+
+ public String getP_APPLICATIONNUM() {
+ return P_APPLICATIONNUM;
+ }
+
+ public void setP_APPLICATIONNUM(String p_APPLICATIONNUM) {
+ P_APPLICATIONNUM = p_APPLICATIONNUM;
+ }
+
+ public String getP_HIGHANDLOWMARK() {
+ return P_HIGHANDLOWMARK;
+ }
+
+ public void setP_HIGHANDLOWMARK(String p_HIGHANDLOWMARK) {
+ P_HIGHANDLOWMARK = p_HIGHANDLOWMARK;
+ }
+
+ public String getP_ITEMCODE() {
+ return P_ITEMCODE;
+ }
+
+ public void setP_ITEMCODE(String p_ITEMCODE) {
+ P_ITEMCODE = p_ITEMCODE;
+ }
+
+ public String getP_ITEMNAME() {
+ return P_ITEMNAME;
+ }
+
+ public void setP_ITEMNAME(String p_ITEMNAME) {
+ P_ITEMNAME = p_ITEMNAME;
+ }
+
+ public String getP_REFERENCEVALUE() {
+ return P_REFERENCEVALUE;
+ }
+
+ public void setP_REFERENCEVALUE(String p_REFERENCEVALUE) {
+ P_REFERENCEVALUE = p_REFERENCEVALUE;
+ }
+
+ public String getP_FIGURERESULT() {
+ return P_FIGURERESULT;
+ }
+
+ public void setP_FIGURERESULT(String p_FIGURERESULT) {
+ P_FIGURERESULT = p_FIGURERESULT;
+ }
+
+ public String getP_RESULTTYPE() {
+ return P_RESULTTYPE;
+ }
+
+ public void setP_RESULTTYPE(String p_RESULTTYPE) {
+ P_RESULTTYPE = p_RESULTTYPE;
+ }
+
+ public String getP_ITEMRESULT() {
+ return P_ITEMRESULT;
+ }
+
+ public void setP_ITEMRESULT(String p_ITEMRESULT) {
+ P_ITEMRESULT = p_ITEMRESULT;
+ }
+
+ public String getP_UNIT() {
+ return P_UNIT;
+ }
+
+ public void setP_UNIT(String p_UNIT) {
+ P_UNIT = p_UNIT;
+ }
+
+ public String getP_CODERESULT() {
+ return P_CODERESULT;
+ }
+
+ public void setP_CODERESULT(String p_CODERESULT) {
+ P_CODERESULT = p_CODERESULT;
+ }
+
+ public Date getP_REPORTTIME() {
+ return P_REPORTTIME;
+ }
+
+ public void setP_REPORTTIME(Date p_REPORTTIME) {
+ P_REPORTTIME = p_REPORTTIME;
+ }
+
+ public Integer getP_PRINTORDER() {
+ return P_PRINTORDER;
+ }
+
+ public void setP_PRINTORDER(Integer p_PRINTORDER) {
+ P_PRINTORDER = p_PRINTORDER;
+ }
+
+ public Integer getP_PRINTGROUP() {
+ return P_PRINTGROUP;
+ }
+
+ public void setP_PRINTGROUP(Integer p_PRINTGROUP) {
+ P_PRINTGROUP = p_PRINTGROUP;
+ }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
new file mode 100644
index 0000000..c4a209a
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
@@ -0,0 +1,110 @@
+package com.lyms.hospitalapi.pojo;
+
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ * P_ID VARCHAR2 病人ID
+ P_NAME VARCHAR2 病人姓名
+ P_SEX NUMBER/VARCHAR2 性别，数字或者汉字均可，0，女；1，男
+ P_BIRTHDAY DATE 出生日期
+ P_CARDNO VARCHAR2 卡号
+ P_BHNUM VARCHAR2 住院号或挂号号
+ P_HUSBANDNAME VARCHAR2 联系人姓名
+ P_MOBILEPHONE VARCHAR2 手机号
+ P_IDNUM VARCHAR2 身份证号
+ CREATED DATE 建档时间
+ */
+public class PregPatientinfo {
+
+ private String P_ID;
+ private String P_NAME;
+ private String P_SEX;
+ private String P_CARDNO;
+ private String P_BHNUM;
+ private String P_HUSBANDNAME;
+ private String P_MOBILEPHONE;
+ private String P_IDNUM;
+ private Date P_BIRTHDAY;
+ private Date CREATED;
+
+ public String getP_ID() {
+ return P_ID;
+ }
+
+ public void setP_ID(String p_ID) {
+ P_ID = p_ID;
+ }
+
+ public String getP_NAME() {
+ return P_NAME;
+ }
+
+ public void setP_NAME(String p_NAME) {
+ P_NAME = p_NAME;
+ }
+
+ public String getP_SEX() {
+ return P_SEX;
+ }
+
+ public void setP_SEX(String p_SEX) {
+ P_SEX = p_SEX;
+ }
+
+ public String getP_CARDNO() {
+ return P_CARDNO;
+ }
+
+ public void setP_CARDNO(String p_CARDNO) {
+ P_CARDNO = p_CARDNO;
+ }
+
+ public String getP_BHNUM() {
+ return P_BHNUM;
+ }
+
+ public void setP_BHNUM(String p_BHNUM) {
+ P_BHNUM = p_BHNUM;
+ }
+
+ public String getP_HUSBANDNAME() {
+ return P_HUSBANDNAME;
+ }
+
+ public void setP_HUSBANDNAME(String p_HUSBANDNAME) {
+ P_HUSBANDNAME = p_HUSBANDNAME;
+ }
+
+ public String getP_MOBILEPHONE() {
+ return P_MOBILEPHONE;
+ }
+
+ public void setP_MOBILEPHONE(String p_MOBILEPHONE) {
+ P_MOBILEPHONE = p_MOBILEPHONE;
+ }
+
+ public String getP_IDNUM() {
+ return P_IDNUM;
+ }
+
+ public void setP_IDNUM(String p_IDNUM) {
+ P_IDNUM = p_IDNUM;
+ }
+
+ public Date getP_BIRTHDAY() {
+ return P_BIRTHDAY;
+ }
+
+ public void setP_BIRTHDAY(Date p_BIRTHDAY) {
+ P_BIRTHDAY = p_BIRTHDAY;
+ }
+
+ public Date getCREATED() {
+ return CREATED;
+ }
+
+ public void setCREATED(Date CREATED) {
+ this.CREATED = CREATED;
+ }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/ConnTools.java
new file mode 100644
index 0000000..8737539
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/ConnTools.java
@@ -0,0 +1,30 @@
+package com.lyms.hospitalapi.v1;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ */
+public class ConnTools {
+ private static String dirverClassName = "com.mysql.jdbc.Driver";
+ private static String url = "jdbc:mysql://192.168.104.101:3306/testdb?useUnicode=true&characterEncoding=utf8";
+ private static String user = "root";
+ private static String password = "leizhimin";
+
+ public static Connection makeConnection() {
+ Connection conn = null;
+ try {
+ Class.forName(dirverClassName);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ try {
+ conn = DriverManager.getConnection(url, user, password);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return conn;
+ }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/README.TXT b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/README.TXT
new file mode 100644
index 0000000..248578a
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/README.TXT
@@ -0,0 +1,2 @@
+版本一
+桓台妇幼
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/ConnTools.java
new file mode 100644
index 0000000..24bdd0d
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/ConnTools.java
@@ -0,0 +1,30 @@
+package com.lyms.hospitalapi.v2;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ */
+public class ConnTools {
+ private static String hisDirverClassName = "com.mysql.jdbc.Driver";
+ private static String hisUrl = "jdbc:oracle:thin:@192.190.10.11:1521:xlsyy";
+ private static String hisUser = "mmbb";
+ private static String hisPassword = "mmbb";
+
+ public static Connection makeHisConnection() {
+ Connection conn = null;
+ try {
+ Class.forName(hisDirverClassName);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ try {
+ conn = DriverManager.getConnection(hisUrl, hisUser, hisPassword);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return conn;
+ }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/HisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/HisService.java
new file mode 100644
index 0000000..fe0e85e
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/HisService.java
@@ -0,0 +1,68 @@
+package com.lyms.hospitalapi.v2;
+
+import com.lyms.platform.common.utils.DateUtil;
+import org.apache.commons.dbutils.QueryRunner;
+import org.apache.commons.dbutils.handlers.BeanListHandler;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ */
+@Service("hisServiceV2")
+public class HisService {
+
+ public Map getPatientInfo(String cardNo){
+ Map map = new HashMap<>();
+ if (StringUtils.isNotBlank(cardNo)) {
+ QueryRunner queryRunner = new QueryRunner();
+ try {
+ List list = queryRunner.query(ConnTools.makeHisConnection(), "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler(XinlePregPatientinfo.class));
+ if (list.size() > 0) {
+ XinlePregPatientinfo info = list.get(0);
+ map.put("sickType", info.getSICKTYPE());
+ map.put("sickId", info.getSICK_ID());
+ map.put("sex", info.getSEX());
+ map.put("name", info.getNAME());
+ map.put("cardNo", info.getIC_CARD_ID());
+ map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ return map;
+ }
+
+ public List> getPatientInfoList(String cardNo){
+ List> result = new ArrayList<>();
+ if (StringUtils.isNotBlank(cardNo)) {
+ QueryRunner queryRunner = new QueryRunner();
+ try {
+ List list = queryRunner.query(ConnTools.makeHisConnection(), "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler(XinlePregPatientinfo.class));
+ if (list.size() > 0) {
+ for (XinlePregPatientinfo info:list) {
+ Map map = new HashMap<>();
+ map.put("sickType", info.getSICKTYPE());
+ map.put("sickId", info.getSICK_ID());
+ map.put("sex", info.getSEX());
+ map.put("name", info.getNAME());
+ map.put("cardNo", info.getIC_CARD_ID());
+ map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
+ result.add(map);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+ return result;
+ }
+
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/README.TXT b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/README.TXT
new file mode 100644
index 0000000..6701563
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/README.TXT
@@ -0,0 +1,2 @@
+版本二
+新乐人民医院
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/XinlePregPatientinfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/XinlePregPatientinfo.java
new file mode 100644
index 0000000..e799d12
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/XinlePregPatientinfo.java
@@ -0,0 +1,91 @@
+package com.lyms.hospitalapi.v2;
+
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2016/9/9 0009.
+ */
+public class XinlePregPatientinfo {
+
+ private String SICKTYPE;
+ private String SICK_ID;
+ private String NAME;
+ private String SEX;
+ private String IC_CARD_ID;
+ private String NULLAH_NUMBER;
+ private String ASSOCIATION_NAME;
+ private String ASSOCIATION_PHONE;
+ private Date BIRTHDATE;
+
+ public String getSICKTYPE() {
+ return SICKTYPE;
+ }
+
+ public void setSICKTYPE(String SICKTYPE) {
+ this.SICKTYPE = SICKTYPE;
+ }
+
+ public String getSICK_ID() {
+ return SICK_ID;
+ }
+
+ public void setSICK_ID(String SICK_ID) {
+ this.SICK_ID = SICK_ID;
+ }
+
+ public String getNAME() {
+ return NAME;
+ }
+
+ public void setNAME(String NAME) {
+ this.NAME = NAME;
+ }
+
+ public String getSEX() {
+ return SEX;
+ }
+
+ public void setSEX(String SEX) {
+ this.SEX = SEX;
+ }
+
+ public String getIC_CARD_ID() {
+ return IC_CARD_ID;
+ }
+
+ public void setIC_CARD_ID(String IC_CARD_ID) {
+ this.IC_CARD_ID = IC_CARD_ID;
+ }
+
+ public String getNULLAH_NUMBER() {
+ return NULLAH_NUMBER;
+ }
+
+ public void setNULLAH_NUMBER(String NULLAH_NUMBER) {
+ this.NULLAH_NUMBER = NULLAH_NUMBER;
+ }
+
+ public String getASSOCIATION_NAME() {
+ return ASSOCIATION_NAME;
+ }
+
+ public void setASSOCIATION_NAME(String ASSOCIATION_NAME) {
+ this.ASSOCIATION_NAME = ASSOCIATION_NAME;
+ }
+
+ public String getASSOCIATION_PHONE() {
+ return ASSOCIATION_PHONE;
+ }
+
+ public void setASSOCIATION_PHONE(String ASSOCIATION_PHONE) {
+ this.ASSOCIATION_PHONE = ASSOCIATION_PHONE;
+ }
+
+ public Date getBIRTHDATE() {
+ return BIRTHDATE;
+ }
+
+ public void setBIRTHDATE(Date BIRTHDATE) {
+ this.BIRTHDATE = BIRTHDATE;
+ }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 832ffb2..7c965e4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1,13 +1,12 @@
package com.lyms.platform.operate.web.facade;
+import com.lyms.hospitalapi.v2.HisService;
import com.lyms.platform.biz.dal.IPersonDao;
import com.lyms.platform.biz.service.*;
import com.lyms.platform.common.enums.*;
import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.JsonUtil;
-import com.lyms.platform.common.utils.StringUtils;
-import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.common.utils.*;
import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
import com.lyms.platform.operate.web.request.MessageListRequest;
import com.lyms.platform.operate.web.request.MessageRequest;
@@ -30,7 +29,6 @@ import org.springframework.stereotype.Component;
import com.lyms.platform.common.constants.ErrorCodeConstants;
import com.lyms.platform.common.result.BaseObjectResponse;
-import com.lyms.platform.common.utils.DateUtil;
import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
import java.util.*;
@@ -41,6 +39,8 @@ import java.util.*;
@Component
public class BookbuildingFacade {
+ public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
+
@Autowired
private YunBookbuildingService yunBookbuildingService;
@@ -79,6 +79,9 @@ public class BookbuildingFacade {
@Autowired
private SmsConfigFacade smsConfigFacade;
+ @Autowired
+ private HisService hisServiceV2;
+
/**
* 添加孕妇建档
* @param yunRequest
@@ -607,10 +610,8 @@ public class BookbuildingFacade {
* @return
*/
public BaseListResponse queryPregnantBuildRecord(BookbuildingQueryRequest bookbuildingQueryRequest) {
-
-
List patients = new ArrayList<>();
-
+ Map typeMap = new HashMap<>();
PatientsQuery patientsQuery = new PatientsQuery();
patientsQuery.setYn(YnEnums.YES.getId());
patientsQuery.setBuildType(1);
@@ -633,6 +634,12 @@ public class BookbuildingFacade {
patientsQuery.setCardNo(patientsVc.get(0).getCardNo());
patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC);
}
+ // 如果为空，初次建档，根据就诊卡号从HIS库取患者信息
+ else {
+ if ("2".equals(HIS_VERSION)) {
+ typeMap.put("hisPatient", hisServiceV2.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo()));
+ }
+ }
}
//历史建档记录
@@ -662,8 +669,6 @@ public class BookbuildingFacade {
- Map typeMap = new HashMap<>();
-
//证件类型
List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
typeMap.put("certeType", pcerteTypeResult);
diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties
index dc84242..ffd9217 100644
--- a/platform-operate-api/src/main/resources/config.properties
+++ b/platform-operate-api/src/main/resources/config.properties
@@ -4,3 +4,5 @@ center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
#区域平台访问短信中心的token
center_token=YMer2016
+#His系统版本 0：未使用，1：桓台，2：新乐
+his_version=0
\ No newline at end of file
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml
index 44712bc..4d9602d 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml
@@ -10,6 +10,8 @@
+
+
diff --git a/pom.xml b/pom.xml
index b5c961a..44bee07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,5 +514,15 @@
velocity-tools
2.0
+
+ com.oracle
+ ojdbc14
+ 11.2.0.1.0
+
+
+ commons-dbutils
+ commons-dbutils
+ 1.6
+