From b7e00f12d16edfd894b07baf0167a02d144f0b0c Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 1 Sep 2017 10:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/permission/model/BabyPatientExtendEarScreen.java  | 1 +
 .../main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml    | 6 ++++++
 .../platform/operate/web/controller/HearDiagnManageController.java  | 2 ++
 .../java/com/lyms/platform/operate/web/facade/BabyEarFacade.java    | 5 +++--
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
index ad3e829..913e7ea 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
@@ -116,6 +116,7 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity {
     private Date lastUpdateDate;
     private String lastUpdateUserId;
     private String lastUpdateHospitalId;
+    //0-正常 1-删除
     private Integer status;
 
     public String getPid() {
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
index 2eef4b3..ee04ab9 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
@@ -464,6 +464,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
                 DATEDIFF(#{nextEndTime},next_check_time) >=0
                 ]]>
             </if>
+            <if test="status != null and status >= 0">
+                and status = #{status,jdbcType=INTEGER}
+            </if>
         </where>
     </select>
 
@@ -610,6 +613,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
             <if test="checkDoctorId!=null and checkDoctorId != ''">
                 and check_doctor_id = #{checkDoctorId}
             </if>
+            <if test="status != null and status >= 0">
+                and status = #{status,jdbcType=INTEGER}
+            </if>
             <if test="pid!=null and pid != ''">
                 and pid = #{pid}
             </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
index b5c23c2..42e0745 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
@@ -517,6 +517,7 @@ public class HearDiagnManageController extends BaseController {
         if (model.getDiagnDoctorId() != null) {
             screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
         }
+        screenQuery.setStatus(0);
         //查询全部数据
         List<BabyPatientExtendEarScreen> earScreens = screenService.dubiousScreen(screenQuery);
 
@@ -937,6 +938,7 @@ public class HearDiagnManageController extends BaseController {
             screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
         }
         screenQuery.setCheckHospitalId(hospitalId);
+        screenQuery.setStatus(0);
 
         //根据儿童条件查询如果为空
         if (CollectionUtils.isEmpty(babyIds) && (model.getMonthAgeStart() != null || model.getMonthAgeEnd() != null || StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() != null || model.getBirthEndTime() != null)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 309d3b2..3510364 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -1469,7 +1469,7 @@ public class BabyEarFacade {
 
 
     /**
-     * 删除儿童听筛记录
+     * 删除儿童档案
      *
      * @param babyEarId 儿童听筛id
      * @return
@@ -1671,7 +1671,7 @@ public class BabyEarFacade {
 
 
     /**
-     * 刪除听筛
+     * 删除听筛
      *
      * @return
      */
@@ -1809,6 +1809,7 @@ public class BabyEarFacade {
         //当前登录人医院Id
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         screenQuery.setCheckHospitalId(hospitalId);
+        screenQuery.setStatus(0);
 
         //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
         if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
-- 
1.8.3.1