From 3f9cbbbe2b125be523ab004c3221e09370763797 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 May 2018 14:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E8=AF=8A=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=85=A5=E5=AD=95?=
 =?UTF-8?q?=E5=A6=87=E9=AB=98=E5=8D=B1=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/pojo/ReferralApplyOrderModel.java     | 46 ++++++++++++++++++++++
 .../web/facade/AntenatalExaminationFacade.java     | 17 ++++++--
 2 files changed, 59 insertions(+), 4 deletions(-)

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 49e2e33..1110827 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
@@ -414,4 +414,50 @@ public class ReferralApplyOrderModel extends BaseModel {
     public void setTransferredHospital(String transferredHospital) {
         this.transferredHospital = transferredHospital;
     }
+
+    @Override
+    public String toString() {
+        return "ReferralApplyOrderModel{" +
+                "id='" + id + '\'' +
+                ", parentId='" + parentId + '\'' +
+                ", pid='" + pid + '\'' +
+                ", name='" + name + '\'' +
+                ", mname='" + mname + '\'' +
+                ", age=" + age +
+                ", sex=" + sex +
+                ", phone='" + phone + '\'' +
+                ", birth=" + birth +
+                ", dueWeek=" + dueWeek +
+                ", days=" + days +
+                ", lastMenses=" + lastMenses +
+                ", otherHighRisk='" + otherHighRisk + '\'' +
+                ", pStatus=" + pStatus +
+                ", cardNo='" + cardNo + '\'' +
+                ", mCardNo='" + mCardNo + '\'' +
+                ", dueDate=" + dueDate +
+                ", rLevel=" + rLevel +
+                ", rRisk=" + rRisk +
+                ", score=" + score +
+                ", transferredHospital='" + transferredHospital + '\'' +
+                ", outHospitalId='" + outHospitalId + '\'' +
+                ", hospitalId='" + hospitalId + '\'' +
+                ", expVip=" + expVip +
+                ", transferredDepartment='" + transferredDepartment + '\'' +
+                ", diseaseDesc='" + diseaseDesc + '\'' +
+                ", transferredDisease='" + transferredDisease + '\'' +
+                ", potentialRisk='" + potentialRisk + '\'' +
+                ", transferMode='" + transferMode + '\'' +
+                ", applyDoctor='" + applyDoctor + '\'' +
+                ", received=" + received +
+                ", recDoctor='" + recDoctor + '\'' +
+                ", created=" + created +
+                ", modified=" + modified +
+                ", status=" + status +
+                ", type=" + type +
+                ", serviceType=" + serviceType +
+                ", operator='" + operator + '\'' +
+                ", diagnosis='" + diagnosis + '\'' +
+                ", otherDiagn='" + otherDiagn + '\'' +
+                '}';
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 40f311a..601c637 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -87,6 +87,8 @@ public class AntenatalExaminationFacade {
     private ModularFunctionConfigService modularFunctionConfigServcie;
     @Autowired
     private PatientCheckTicketService patientCheckTicketService;
+    @Autowired
+    private CommonService commonService;
 
     @Autowired
     private CouponService couponService;
@@ -442,6 +444,8 @@ public class AntenatalExaminationFacade {
         commonThreadPool.execute(new Runnable() {
             @Override
             public void run() {
+                Patients patients = patientsService.findOnePatientById(parentId);
+
                 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
                 referralApplyOrderQuery.setParentId(parentId);
 
@@ -450,12 +454,20 @@ public class AntenatalExaminationFacade {
                 //其他诊断
                 referralApplyOrderModel.setOtherDiagn(antenatalExamination.getOtherRisk());
                 referralApplyOrderModel.setDiagnosis(antenatalExamination.getDiagnosis());
+                List<String> rlevel=Collections.emptyList();
+                if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
+                    rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
+                    com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true);
+                }
+                referralApplyOrderModel.setrLevel(rlevel);
                 try {
                     List l = JsonUtil.toList(antenatalExamination.getRiskFactor(), List.class);
                     referralApplyOrderModel.setrRisk(queryRiskName(l));
+                    System.out.println("待修改转诊信息："+referralApplyOrderModel.toString());
                 } catch (Exception e) {
+                    e.printStackTrace();
                 }
-
+                System.out.println("查询转诊条件："+referralApplyOrderQuery.convertToQuery().convertToMongoQuery());
                 applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel);
             }
         });
@@ -1421,9 +1433,6 @@ public class AntenatalExaminationFacade {
      * 处理产程数据
      */
     private void distPatientData(List<Patients> patientses, List<List<AntData>> sortList) {
-        Set<List<AntData>> resultDatas = new TreeSet<>();
-
-
         Iterator<Patients> iterator = patientses.iterator();
         Organization organization = null;
         String patientId = "";
-- 
1.8.3.1