From e3952cbc1e2237e4d99b7b466914320a016341fc Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 27 Oct 2017 14:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/LisCrisisItemController.java    | 23 ++++++++++++++++++++--
 .../operate/web/facade/ApplyOrderFacade.java       |  7 +++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
index aa40812..3b33258 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java
@@ -125,8 +125,27 @@ public class LisCrisisItemController extends BaseController {
                 map.put("emergenceId", data.getId());
                 map.put("hospitalId", data.getHospitalId());
                 content.put("type", data.getItemName());
-                content.put("ref", data.getRef() + " " + data.getUnit());
-                content.put("real", data.getResult() + " " + data.getUnit());
+                String ref = "";
+                if (data.getRef()  != null && data.getUnit() != null)
+                {
+                    ref = data.getRef() + " " + data.getUnit();
+                }
+                else if (data.getRef()  != null)
+                {
+                    ref = data.getRef();
+                }
+                content.put("ref", ref);
+
+                String real = "";
+                if (data.getResult()  != null && data.getUnit() != null)
+                {
+                    real = data.getResult() + " " + data.getUnit();
+                }
+                else if (data.getResult()  != null)
+                {
+                    real = data.getResult();
+                }
+                content.put("real", real);
                 map.put("content", JsonUtil.obj2JsonString(content));
                 map.put("applyDoctorCode", data.getApplyDoctorCode());
                 map.put("applyDoctorName", data.getApplyDoctorName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 16bac41e..4b0ad05 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -68,6 +68,9 @@ public class ApplyOrderFacade {
     @Autowired
     private OrganizationGroupsFacade groupsFacade;
 
+    @Autowired
+    private OperateLogFacade operateLogFacade;
+
     /**
      * 增加转诊申请
      *
@@ -182,6 +185,8 @@ public class ApplyOrderFacade {
                             patients.setExpVip(0);
                             patients.setEnable("0");
                             id = patientsService.addPatient(patients).getId();
+
+                            operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊");
                         } else {
                             Patients patients1 = patientsList.get(0);
                             id = patients1.getId();
@@ -257,6 +262,8 @@ public class ApplyOrderFacade {
                             babyModel.setBuildType(3);
                             babyModel.setEnable("0");
                             id = babyService.addOneBaby(babyModel).getId();
+
+                            operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),babyModel,OptActionEnums.ADD.getId(),"添加儿童转诊");
                         } else {
                             BabyModel babyModel1 = babyModels.get(0);
                             id = babyModel1.getId();
-- 
1.8.3.1