From 0dff189ca9a19b4cd302beac844bc9d14672226c Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 14 Nov 2017 14:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=99=A2=E6=8F=90=E9=86=92=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/model/PatientMarkHospital.java       | 12 ++++++++++++
 .../permission/model/PatientMarkHospitalQuery.java  | 13 +++++++++++++
 .../mainOrm/master/PatientMarkHospital.xml          | 13 ++++++++++---
 .../web/facade/PatientMarkHospServiceFacade.java    | 11 +++++++++++
 .../operate/web/result/PatienMarkHospResult.java    | 21 +++++++++++++++++++++
 5 files changed, 67 insertions(+), 3 deletions(-)

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 @@
         <result column="hospit_status" property="hospitStatus" jdbcType="INTEGER"/>
         <result column="hospit_date" property="hospitDate" jdbcType="TIMESTAMP"/>
         <result column="hospit_type" property="hospitType" jdbcType="INTEGER"/>
+        <result column="is_reality" property="isReality" jdbcType="INTEGER"/>
     </resultMap>
 
 
     <insert id="addPatientMarkHospital" parameterType="com.lyms.platform.permission.model.PatientMarkHospital">
-        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})
     </insert>
 
 
@@ -111,6 +112,9 @@
             <if test="hospitType != null">
                 hospit_type = #{hospitType,jdbcType=INTEGER},
             </if>
+            <if test="isReality != null">
+                is_reality = #{isReality,jdbcType=INTEGER},
+            </if>
         </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -122,7 +126,7 @@
 
 
     <select id="getPatientMarkHospital" resultMap="PatientMarkHospitalResultMap" parameterType="java.lang.String">
-        select 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
+        select 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
         from patient_mark_hospital where id = #{id,jdbcType=VARCHAR}
     </select>
 
@@ -270,6 +274,9 @@
             <if test="hospitType != null">
                 and hospit_type = #{hospitType,jdbcType=INTEGER}
             </if>
+            <if test="isReality != null">
+                and is_reality = #{isReality,jdbcType=INTEGER}
+            </if>
             <if test="sql != null">
                 ${sql}
             </if>
@@ -473,7 +480,7 @@
     <select id="queryPatientMarkHospital" resultMap="PatientMarkHospitalResultMap"
             parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
         select
-        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
+        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
         from patient_mark_hospital
         <include refid="PatientMarkHospitalCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
index a0f3930..8c83026 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
@@ -6,6 +6,7 @@ import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.MakeHospitalEnums;
 import com.lyms.platform.common.enums.OptActionEnums;
+import com.lyms.platform.common.enums.VomitEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
@@ -916,6 +917,13 @@ public class PatientMarkHospServiceFacade {
         }
         result.setBackStatus(ps.getBackStatus());
 
+        result.setIsReality(ps.getIsReality());
+        if(ps.getIsReality()!=null){
+            result.setIsRealityStr(VomitEnums.getName(String.valueOf(ps.getIsReality())));
+        }else{
+            result.setIsRealityStr("--");
+        }
+
         result.setBackStatusStr(ps.getBackStatus() == 1 ? "待提醒" : "已提醒");
         result.setBackResult(ps.getBackResult());
         if (ps.getBackResult() != null) {
@@ -1080,6 +1088,7 @@ public class PatientMarkHospServiceFacade {
     public void synLlHisData(int offset, int page) {
         System.out.println("同步查询乐陵住院数据");
         PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
+        patientMarkHospQuery.setHospitStatus(1);
         patientMarkHospQuery.setSort("hospit_date");
         patientMarkHospQuery.setNeed("y");
         patientMarkHospQuery.setOffset(offset);
@@ -1120,6 +1129,8 @@ public class PatientMarkHospServiceFacade {
                 for (Map<String, String> map : makePatients) {
                     String inHospDiagn = map.get("inHospDiagn");
                     int hospType = getHospitType(inHospDiagn);
+                    //默认实际住院
+                    ps.setIsReality(1);
                     ps.setHospitStatus(2);
                     ps.setHospitType(hospType);
                     String inHospDate = map.get("inHospDate");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
index 876dad8..feedd4e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
@@ -138,6 +138,27 @@ public class PatienMarkHospResult {
      */
     private Integer hospitType;
     private String hospitTypeStr;
+    /**
+     * 是否实际住院1-是，2-否
+     */
+    private Integer isReality;
+    private String isRealityStr;
+
+    public Integer getIsReality() {
+        return isReality;
+    }
+
+    public void setIsReality(Integer isReality) {
+        this.isReality = isReality;
+    }
+
+    public String getIsRealityStr() {
+        return isRealityStr;
+    }
+
+    public void setIsRealityStr(String isRealityStr) {
+        this.isRealityStr = isRealityStr;
+    }
 
     public String getId() {
         return id;
-- 
1.8.3.1