From 2edff08457311372a6b9582a19e181ad277ff44d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 17 Jul 2019 14:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E6=B0=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/pojo/BloodOxygenModel.java     | 18 +-----------------
 .../operate/web/facade/BloodOxygenFacade.java        | 11 +----------
 .../operate/web/request/BloodOxygenRequest.java      | 20 --------------------
 3 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java
index b1b56f9..aad9fae 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodOxygenModel.java
@@ -23,8 +23,6 @@ public class BloodOxygenModel extends BaseModel {
     //脉搏
     private String pulse;
 
-    //灌注指数
-    private String perfusion;
 
     //血氧饱和度异常
     private String bloodOxygenSaturationExc;
@@ -32,8 +30,7 @@ public class BloodOxygenModel extends BaseModel {
     //脉搏异常
     private String pulseExc;
 
-    //灌注指数异常
-    private String perfusionExc;
+
 
     private String hospitalId;
 
@@ -62,13 +59,7 @@ public class BloodOxygenModel extends BaseModel {
         this.pulseExc = pulseExc;
     }
 
-    public String getPerfusionExc() {
-        return perfusionExc;
-    }
 
-    public void setPerfusionExc(String perfusionExc) {
-        this.perfusionExc = perfusionExc;
-    }
 
     public String getId() {
         return id;
@@ -94,13 +85,7 @@ public class BloodOxygenModel extends BaseModel {
         this.pulse = pulse;
     }
 
-    public String getPerfusion() {
-        return perfusion;
-    }
 
-    public void setPerfusion(String perfusion) {
-        this.perfusion = perfusion;
-    }
 
     public String getHospitalId() {
         return hospitalId;
@@ -148,7 +133,6 @@ public class BloodOxygenModel extends BaseModel {
                 "id='" + id + '\'' +
                 ", bloodOxygenSaturation='" + bloodOxygenSaturation + '\'' +
                 ", pulse='" + pulse + '\'' +
-                ", perfusion='" + perfusion + '\'' +
                 ", hospitalId='" + hospitalId + '\'' +
                 ", patientId='" + patientId + '\'' +
                 ", pId='" + pId + '\'' +
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java
index d35cec2..98ca2cb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BloodOxygenFacade.java
@@ -87,19 +87,11 @@ public class BloodOxygenFacade {
                 item2.setPrintOrder("2");
                 item2.setUnit("BPM");
                 item2.setResultFlag(request.getPulseExc());
+                item1.setRef("60BPM～100BPM");
 
-                LisReportItemModel item3 = new LisReportItemModel();
-                item3.setHospitalId(patient.getHospitalId());
-                item3.setCharResult(request.getPerfusion());
-                item3.setLisId(uuid);
-                item3.setName("灌注指数");
-                item3.setPrintOrder("3");
-                item3.setUnit("%");
-                item3.setResultFlag(request.getPerfusionExc());
 
                 items.add(item1);
                 items.add(item2);
-                items.add(item3);
 
                 lisModel.setItemJson(JsonUtil.array2JsonString(items));
                 masterLisMapper.saveLisData(lisModel);
@@ -123,7 +115,6 @@ public class BloodOxygenFacade {
                 map.put("created",DateUtil.getyyyy_MM_dd(model.getCreated()));
                 map.put("bloodOxygenSaturation",model.getBloodOxygenSaturation());
                 map.put("pulse",model.getPulse());
-                map.put("perfusion",model.getPerfusion());
                 map.put("id",model.getId());
                 datas.add(map);
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java
index 068ef6e..e634b6c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BloodOxygenRequest.java
@@ -24,11 +24,6 @@ public class BloodOxygenRequest implements IBasicRequestConvert<BloodOxygenModel
     //脉搏异常
     private String pulseExc;
 
-    //灌注指数
-    private String perfusion;
-
-    //灌注指数异常
-    private String perfusionExc;
 
     private String hospitalId;
 
@@ -46,11 +41,9 @@ public class BloodOxygenRequest implements IBasicRequestConvert<BloodOxygenModel
         BloodOxygenModel model = new BloodOxygenModel();
         model.setBloodOxygenSaturation(bloodOxygenSaturation);
         model.setPulse(pulse);
-        model.setPerfusion(perfusion);
 
         model.setBloodOxygenSaturationExc(bloodOxygenSaturationExc);
         model.setPulseExc(pulseExc);
-        model.setPerfusionExc(perfusionExc);
 
         model.setHospitalId(hospitalId);
         model.setId(id);
@@ -83,13 +76,6 @@ public class BloodOxygenRequest implements IBasicRequestConvert<BloodOxygenModel
         this.pulse = pulse;
     }
 
-    public String getPerfusion() {
-        return perfusion;
-    }
-
-    public void setPerfusion(String perfusion) {
-        this.perfusion = perfusion;
-    }
 
     public String getHospitalId() {
         return hospitalId;
@@ -147,11 +133,5 @@ public class BloodOxygenRequest implements IBasicRequestConvert<BloodOxygenModel
         this.pulseExc = pulseExc;
     }
 
-    public String getPerfusionExc() {
-        return perfusionExc;
-    }
 
-    public void setPerfusionExc(String perfusionExc) {
-        this.perfusionExc = perfusionExc;
-    }
 }
-- 
1.8.3.1