From 8905aafc0a87310c10cb21bd96b79efa9ee5650c Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 28 May 2018 18:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=85=A5=E8=BD=AC=E5=87=BA=E9=AB=98?=
 =?UTF-8?q?=E5=8D=B1=E5=88=97=E8=A1=A8=E5=8A=A0=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E6=89=A7=E5=8D=95=E4=BF=A1=E6=81=AF=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/biz/dal/IReferralApplyOrderDao.java   |  7 +-
 .../biz/dal/impl/ReferralApplyOrderDaoImpl.java    |  5 ++
 .../platform/biz/service/ApplyOrderService.java    |  4 ++
 .../platform/pojo/ReferralApplyOrderModel.java     | 23 ++++++-
 .../web/controller/ApplyOrderController.java       | 13 ++--
 .../operate/web/facade/ApplyOrderFacade.java       | 29 +++++----
 .../web/request/ReferralApplyOrderAddRequest.java  |  3 +-
 .../web/request/ReferralReceiptRequest.java        | 75 ++++++++++++++++++++++
 .../web/request/SieveApplyOrderAddRequest.java     |  3 +-
 .../web/result/ReferralApplyOrderResult.java       | 22 +++++++
 10 files changed, 163 insertions(+), 21 deletions(-)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java
index ee80423..8b0e7b6 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IReferralApplyOrderDao.java
@@ -2,7 +2,6 @@ package com.lyms.platform.biz.dal;
 
 import com.lyms.platform.common.dao.operator.MongoQuery;
 import com.lyms.platform.pojo.ReferralApplyOrderModel;
-import com.lyms.platform.query.ReferralApplyOrderQuery;
 
 import java.util.List;
 
@@ -27,6 +26,12 @@ public interface IReferralApplyOrderDao {
      * @return
      */
     List<ReferralApplyOrderModel> queryList(MongoQuery mongoQuery);
+    /**
+     * 根据id查询转账单
+     *
+     * @return
+     */
+    ReferralApplyOrderModel findById(String id);
 
     Integer count(MongoQuery mongoQuery);
 
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java
index 8d4c70c..e18b364 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java
@@ -29,6 +29,11 @@ public class ReferralApplyOrderDaoImpl extends BaseMongoDAOImpl<ReferralApplyOrd
         return find(mongoQuery.convertToMongoQuery());
     }
 
+    @Override
+    public ReferralApplyOrderModel findById(String id) {
+        return findById(id);
+    }
+
     public Integer count(MongoQuery mongoQuery) {
         return (int) count(mongoQuery.convertToMongoQuery());
     }
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
index bc736e7..f8d727b 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
@@ -45,6 +45,10 @@ public class ApplyOrderService {
 //        return iReferralApplyOrderDao.queryList(babyQuery.convertToQuery());
     }
 
+    public ReferralApplyOrderModel findByIdReferralApplyOrder(String id) {
+        return iReferralApplyOrderDao.findById(id);
+    }
+
     public SieveApplyOrderModel addOneSieveApplyOrder(SieveApplyOrderModel obj) {
         obj.setStatus(0);
         return iSieveApplyOrderDao.addApplyOrder(obj);
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
index b623c62..49e2e33 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
@@ -85,10 +85,31 @@ public class ReferralApplyOrderModel extends BaseModel {
     private Integer status;
     //转诊类型   1 儿童 2 孕妇
     private Integer type;
-
     private Integer serviceType;
     //操作人
     private String operator;
+    //目前诊断
+    private String diagnosis;
+    //其他诊断
+    private String otherDiagn;
+
+
+
+    public String getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+
+    public String getOtherDiagn() {
+        return otherDiagn;
+    }
+
+    public void setOtherDiagn(String otherDiagn) {
+        this.otherDiagn = otherDiagn;
+    }
 
     public String getOperator() {
         return operator;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
index e9e4da0..51569e3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
@@ -6,10 +6,7 @@ import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.operate.web.facade.ApplyOrderFacade;
-import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest;
-import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
-import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
-import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
+import com.lyms.platform.operate.web.request.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -44,6 +41,14 @@ public class ApplyOrderController extends BaseController {
         return applyOrderFacade.queryReferralApplyOrder(id);
     }
 
+    //增加或修改转诊单的回执信息
+    @RequestMapping(method = RequestMethod.POST,value = "/referralReceipt")
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse addReferralReceipt(@Valid @RequestBody ReferralReceiptRequest referralReceiptRequest, HttpServletRequest request) {
+        return applyOrderFacade.addReferralReceipt(referralReceiptRequest);
+    }
+
     //增加儿童转诊申请单
     @RequestMapping(method = RequestMethod.POST,value = "/referralapply")
     @ResponseBody
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 0eb64fe..ffe6a01 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
@@ -8,10 +8,7 @@ import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.*;
-import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest;
-import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
-import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
-import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest;
+import com.lyms.platform.operate.web.request.*;
 import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
@@ -70,6 +67,20 @@ public class ApplyOrderFacade {
     @Autowired
     private CommonService commonService;
 
+    public BaseResponse addReferralReceipt(ReferralReceiptRequest referralReceipt){
+
+        ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(referralReceipt.getId());
+        referralReceipt.convertToDataModel(referralApplyOrderModel);
+        if(StringUtils.isNotEmpty(referralApplyOrderModel.getId())){
+            ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery();
+            referralApplyOrderQuery1.setId(referralReceipt.getId());
+            applyOrderService.updateByParentId(referralApplyOrderQuery1,referralApplyOrderModel);
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        }else{
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("错误");
+        }
+    }
+
     /**
      * 增加转诊申请
      *
@@ -204,7 +215,6 @@ public class ApplyOrderFacade {
                 }
             }
         } else {
-
             BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
             if (null != babyModel) {
                 id = babyModel.getId();
@@ -439,7 +449,6 @@ public class ApplyOrderFacade {
 
                 }
             }
-
             if (NumberUtils.isNumber(zhuanru)) {
                 try {
                     Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
@@ -452,10 +461,8 @@ public class ApplyOrderFacade {
 
                 }
             }
-
             referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
             referralApplyOrderResult.setTransferredHospital(map1);
-
             Map map = new HashMap();
             if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) {
                 Users users = usersService.getUsers(Integer.valueOf(list.get(0).getApplyDoctor()));
@@ -464,10 +471,7 @@ public class ApplyOrderFacade {
                     map.put("name", users.getName());
                 }
             }
-
             referralApplyOrderResult.setApplyDoctor(map);
-
-
             List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
             referralApplyOrderResult.setScreenResult(screenList);
 
@@ -589,7 +593,7 @@ public class ApplyOrderFacade {
 
 //                List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid());
 
-                List<String> diagnoseList = applyOrderModel.getrRisk();
+
                 if (NumberUtils.isNumber(zhuanchu)) {
                     try {
                         Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
@@ -635,6 +639,7 @@ public class ApplyOrderFacade {
                 }
 
                 String diagnose = "";
+                List<String> diagnoseList = applyOrderModel.getrRisk();
                 if (CollectionUtils.isNotEmpty(diagnoseList)) {
                     diagnose = "";
                     for (String obj : diagnoseList) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java
index ba77a29..f4f573a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyOrderAddRequest.java
@@ -1,8 +1,8 @@
 package com.lyms.platform.operate.web.request;
 
 import com.lyms.platform.common.base.IBasicRequestConvert;
-import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.core.annotation.form.Form;
+import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.pojo.ReferralApplyOrderModel;
 
 /**
@@ -32,7 +32,6 @@ public class ReferralApplyOrderAddRequest implements IBasicRequestConvert<Referr
     private String transferMode;
     @FormParam
     private String applyDoctor;
-
     public String getPid() {
         return pid;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java
new file mode 100644
index 0000000..7298cfb
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java
@@ -0,0 +1,75 @@
+package com.lyms.platform.operate.web.request;
+
+import com.lyms.platform.pojo.ReferralApplyOrderModel;
+
+import java.util.List;
+
+/**
+ * @auther yangfei
+ * @createTime 2018年05月28日 17时25分
+ * @discription 转诊单回执信息
+ */
+public class ReferralReceiptRequest {
+    public String id;
+    //高危风险因素
+    private List<String> rRisk;
+    //目前诊断
+    private String diagnosis;
+    //其他诊断
+    private String otherDiagn;
+    //接收医生
+    private String recDoctor;
+
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<String> getrRisk() {
+        return rRisk;
+    }
+
+    public void setrRisk(List<String> rRisk) {
+        this.rRisk = rRisk;
+    }
+
+    public String getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+
+    public String getOtherDiagn() {
+        return otherDiagn;
+    }
+
+    public void setOtherDiagn(String otherDiagn) {
+        this.otherDiagn = otherDiagn;
+    }
+
+    /**
+     * 具体转换实现
+     *
+     * @return 转换后的model
+     */
+    public void convertToDataModel(ReferralApplyOrderModel referralApplyOrderModel) {
+        referralApplyOrderModel.setId(id);
+        referralApplyOrderModel.setrRisk(rRisk);
+        referralApplyOrderModel.setDiagnosis(diagnosis);
+        referralApplyOrderModel.setOtherDiagn(otherDiagn);
+        referralApplyOrderModel.setRecDoctor(recDoctor);
+    }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
index 94873a2..d1a0ce8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
@@ -26,10 +26,11 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
     @FormParam
     private String applyDoctor;
     private String pid;
-
     //申请时间
     private String applyTime;
 
+
+
     public String getPid() {
         return pid;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
index 1bd0614..dacbdde 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
@@ -68,6 +68,26 @@ public class ReferralApplyOrderResult {
     private String zhuanCName;
     //转入医院
     private String zhuanRname;
+    //目前诊断
+    private String diagnosis;
+    //其他诊断
+    private String otherDiagn;
+
+    public String getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+
+    public String getOtherDiagn() {
+        return otherDiagn;
+    }
+
+    public void setOtherDiagn(String otherDiagn) {
+        this.otherDiagn = otherDiagn;
+    }
 
     public List<Map<String, Object>> getScreenResult() {
         return screenResult;
@@ -247,6 +267,8 @@ public class ReferralApplyOrderResult {
 
     public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients,String zhuanCName ,String zhuanRname) {
         setId(destModel.getId());
+        setDiagnosis(destModel.getDiagnosis());
+        setDiseaseDesc(destModel.getDiseaseDesc());
         setParentId(destModel.getParentId());
         setName(destModel.getName());
         setAge(destModel.getAge());
-- 
1.8.3.1