From 5981c68e44c2c09378a6b35ddc9d3231ca74214e Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 10 Jan 2018 02:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientServiceFacade.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index ed2c357..e7e677d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -249,7 +249,7 @@ public class PatientServiceFacade {
             operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务");
 
             if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童建档服务数据处理
-                if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == Integer.parseInt(serInfo.get("serType"))) {
+                if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
                     BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest();
                     babyBookbuildingAddRequest.setId(ps.getParentid());
                     babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
@@ -304,7 +304,7 @@ public class PatientServiceFacade {
         if (before.getPerType() != null && before.getPerType() == 2) {//儿童建档服务数据处理
             BabyBookbuildingAddRequest babyBookbuildingAddRequest = new BabyBookbuildingAddRequest();
             babyBookbuildingAddRequest.setId(ps.getParentid());
-            if (PatientSerEnums.SerTypeEnums.babyjzzz.getId() == ps.getSerType()) {
+            if (PatientSerEnums.SerTypeEnums.babyjzzz.getId().intValue() == ps.getSerType().intValue()) {
                 babyBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
                 if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) {
                     babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
@@ -315,7 +315,7 @@ public class PatientServiceFacade {
                 } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) {
                     babyBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId());
                 }
-            } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId() == ps.getSerType()) {
+            } else if (PatientSerEnums.SerTypeEnums.babyBzfw.getId().intValue() == ps.getSerType().intValue()) {
                 PatientServiceQuery query = new PatientServiceQuery();
                 query.setParentid(after.getParentid());
                 query.setSerType(PatientSerEnums.SerTypeEnums.babyjzzz.getId());
@@ -337,7 +337,7 @@ public class PatientServiceFacade {
             babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest);
         } else {//孕妇建档服务数据处理
             YunBookbuildingAddRequest yunBookbuildingAddRequest = new YunBookbuildingAddRequest();
-            if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {//孕期精准指导同步到建档
+            if (PatientSerEnums.SerTypeEnums.yqjzzd.getId().intValue() == ps.getSerType().intValue()) {//孕期精准指导同步到建档
                 yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
                 if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) {
                     yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
@@ -348,7 +348,7 @@ public class PatientServiceFacade {
                 } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.zt.getId()) {
                     yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.SUSPEND.getId());
                 }
-            }else if(PatientSerEnums.SerTypeEnums.bzfw.getId() == ps.getSerType()){
+            }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){
                 PatientServiceQuery query = new PatientServiceQuery();
                 query.setParentid(after.getParentid());
                 query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
@@ -356,7 +356,7 @@ public class PatientServiceFacade {
                 //是否有增值服务--没有则处理标准服务
                 if (count == 0) {
                     yunBookbuildingAddRequest.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
-                    if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.kt.getId()) {
+                    if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) {
                         yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
                     } else if (ps.getSerStatus() == PatientSerEnums.SerStatusEnums.td.getId()) {
                         yunBookbuildingAddRequest.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId());
-- 
1.8.3.1