diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index cac3f45..59434c8 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -1245,6 +1245,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
commomVo.setDisDate(archive_masterVos.get(a).getDischargeDateTime());
commomVo.setDisDept(archive_masterVos.get(a).getDeptName1());
commomVo.setAttending(archive_masterVos.get(a).getDoctorInCharge());
+ if (StringUtils.isNotBlank(archive_masterVos.get(a).getIdNo())){
+ commomVo.setIdCard(archive_masterVos.get(a).getIdNo());
+ }
archive_masterMapper.insertCommonlyUsed(commomVo);
}
diff --git a/src/main/java/com/emr/vo/CommomVo.java b/src/main/java/com/emr/vo/CommomVo.java
index 43220fb..31d7aa4 100644
--- a/src/main/java/com/emr/vo/CommomVo.java
+++ b/src/main/java/com/emr/vo/CommomVo.java
@@ -65,8 +65,6 @@ public class CommomVo {
private String birthAddr;//出生地
- private String idCard;//身份证号
-
private String job;//职业
private String marriage;//婚况
@@ -123,6 +121,8 @@ public class CommomVo {
private String isMedicine;//是否药物过敏
+ private String idCard;
+
private String emitPathology;//是否尸亡尸检
private String deptDirector;//科主任
diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties
index 1d42bf4..772f5af 100644
--- a/src/main/resources/config/config.properties
+++ b/src/main/resources/config/config.properties
@@ -1,6 +1,6 @@
power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3
-POWER_IP = localhost
-POWER_PORT = 8085
+POWER_IP = 172.16.11.90
+POWER_PORT = 8081
#POWER_IP = 172.16.11.90
#POWER_PORT = 8081
@@ -63,5 +63,6 @@ export_pdf_path=D://export//
#\u5bfc\u51fa\u4fe1\u606f\u683c\u5f0f\u9700\u8981\u4e3aunicode\u683c\u5f0f\u4e0d\u7136\u4f1a\u4e71\u7801
-export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662
+export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u6f6e\u5dde\u5e02\u4eba\u6c11\u533b\u9662
+
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 067d7aa..3d02fdd 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -8,9 +8,9 @@
\u6570\u636E\u5E93IP
dataBaseIp=localhost
#\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=gm_record
+dataBaseName=emr_record
#\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=admin123
+dataBasePassword=docus@702
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}
@@ -39,4 +39,3 @@ logAbandoned: true
-
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 924e3e5..3064045 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -1276,6 +1276,9 @@
admiss_days,
+
+ id_card,
+
@@ -1320,6 +1323,9 @@
#{admissDays,jdbcType=INTEGER},
+
+ #{idCard},
+