diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java
index 80e8563..e7c6748 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java
@@ -103,6 +103,18 @@ public class PatientMarkHospital {
* 住院类型(1-分娩住院、2-其他住院)
*/
private Integer hospitType;
+ /**
+ * 是否实际住院1-是,2-否
+ */
+ private Integer isReality;
+
+ public Integer getIsReality() {
+ return isReality;
+ }
+
+ public void setIsReality(Integer isReality) {
+ this.isReality = isReality;
+ }
public Integer getHospitType() {
return hospitType;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java
index a6051d4..6c8919a 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java
@@ -148,6 +148,19 @@ public class PatientMarkHospitalQuery extends BaseQuery {
*/
private String sql;
+ /**
+ * 是否实际住院1-未住院,2-已住院
+ */
+ private Integer isReality;
+
+ public Integer getIsReality() {
+ return isReality;
+ }
+
+ public void setIsReality(Integer isReality) {
+ this.isReality = isReality;
+ }
+
public Date getHospitStartDate() {
return hospitStartDate;
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
index 611e130..dc747bb 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
@@ -28,11 +28,12 @@
+
- insert into patient_mark_hospital (id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type) values (#{id},#{patientId},#{pid},#{backStatus},#{backResult},#{backDoctor},#{backDate},#{backMakeDate},#{backRemark},#{backFailure},#{inHospitStatus},#{inHospitResult},#{inHospitDoctor},#{inHospitDate},#{inHospitMakeDate},#{inHospitRemark},#{inHospitFailure},#{makeInHospitDate},#{makeDate},#{makeDoctor},#{makeRemark},#{hospitalId},#{hospitStatus},#{hospitDate},#{hospitType})
+ insert into patient_mark_hospital (id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type,is_reality) values (#{id},#{patientId},#{pid},#{backStatus},#{backResult},#{backDoctor},#{backDate},#{backMakeDate},#{backRemark},#{backFailure},#{inHospitStatus},#{inHospitResult},#{inHospitDoctor},#{inHospitDate},#{inHospitMakeDate},#{inHospitRemark},#{inHospitFailure},#{makeInHospitDate},#{makeDate},#{makeDoctor},#{makeRemark},#{hospitalId},#{hospitStatus},#{hospitDate},#{hospitType},#{isReality})
@@ -111,6 +112,9 @@
hospit_type = #{hospitType,jdbcType=INTEGER},
+
+ is_reality = #{isReality,jdbcType=INTEGER},
+
where id = #{id,jdbcType=VARCHAR}
@@ -122,7 +126,7 @@
@@ -270,6 +274,9 @@
and hospit_type = #{hospitType,jdbcType=INTEGER}
+
+ and is_reality = #{isReality,jdbcType=INTEGER}
+
${sql}
@@ -473,7 +480,7 @@