From 0ccb6c00485a5af7eef367a20d8b72b6abf3c76c Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 28 May 2018 16:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=8A=E5=8D=95=E7=8E=B0=E5=AE=9E?=
 =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/biz/service/PatientsService.java   |  1 -
 .../permission/dao/master/HospitalServiceContentMapper.java   |  2 +-
 .../service/impl/HospitalServiceContentServiceImpl.java       |  3 ++-
 .../main/resources/mainOrm/master/HospitalServiceContent.xml  |  2 +-
 .../operate/web/facade/AntenatalExaminationFacade.java        |  2 +-
 .../lyms/platform/operate/web/facade/ApplyOrderFacade.java    |  7 ++++---
 .../platform/operate/web/result/ReferralApplyOrderResult.java | 11 ++++++++++-
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index 5a4c577..776b80b 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -47,7 +47,6 @@ public class PatientsService {
     @Autowired
     private TrackDownRecordService trackDownRecordService;
 
-
     public Patients addPatient(Patients obj) {
         return iPatientDao.addPatient(obj);
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java
index 49aa6e2..30af818 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java
@@ -20,6 +20,6 @@ public interface HospitalServiceContentMapper {
 
     public List<HospitalServiceContent> queryGroupHospitalServiceContent(HospitalServiceContentQuery query);
 
-    public int queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query);
+    public Integer queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query);
 
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java
index a6a2245..ee95334 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java
@@ -51,7 +51,8 @@ public class HospitalServiceContentServiceImpl implements HospitalServiceContent
     @Override
     public List<HospitalServiceContent> queryGroupHospitalServiceContent(HospitalServiceContentQuery query) {
         if (query.getNeed() != null) {
-            query.mysqlBuild(hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query));
+            Integer count = hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query);
+            query.mysqlBuild(count==null?0:count);
         }
         return hospitalServiceContentMapper.queryGroupHospitalServiceContent(query);
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
index 042876b..d575d5a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
@@ -110,7 +110,7 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta
         <include refid="orderAndLimit"/>
     </select>
 
-    <select id="queryGroupHospitalServiceContentCount" resultType="int"
+    <select id="queryGroupHospitalServiceContentCount" resultType="INTEGER"
             parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
         select count(1) from hospital_service_content
         <include refid="HospitalServiceContentCondition"/>
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 edfbb72..c64fb7a 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
@@ -2618,7 +2618,7 @@ public class AntenatalExaminationFacade {
         return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
-    private List<Map<String, Object>> getscreenResult(List<String> screenResult) {
+    public List<Map<String, Object>> getscreenResult(List<String> screenResult) {
         List<Map<String, Object>> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(screenResult)) {
             BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
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 2765458..0eb64fe 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
@@ -65,7 +65,6 @@ public class ApplyOrderFacade {
     private BabyCheckFacade babyCheckFacade;
     @Autowired
     private OrganizationGroupsFacade groupsFacade;
-
     @Autowired
     private OperateLogFacade operateLogFacade;
     @Autowired
@@ -455,8 +454,6 @@ public class ApplyOrderFacade {
             }
 
             referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname);
-
-
             referralApplyOrderResult.setTransferredHospital(map1);
 
             Map map = new HashMap();
@@ -470,6 +467,10 @@ public class ApplyOrderFacade {
 
             referralApplyOrderResult.setApplyDoctor(map);
 
+
+            List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
+            referralApplyOrderResult.setScreenResult(screenList);
+
         }
         return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
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 3bb9222..1bd0614 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
@@ -50,7 +50,8 @@ public class ReferralApplyOrderResult {
     private Map transferredHospital;
     //转出医院id
     private String outHospitalId;
-
+    //筛查结果
+    private List<Map<String, Object>> screenResult;
     //转入科室
     private String transferredDepartment;
     //病情描述
@@ -68,6 +69,14 @@ public class ReferralApplyOrderResult {
     //转入医院
     private String zhuanRname;
 
+    public List<Map<String, Object>> getScreenResult() {
+        return screenResult;
+    }
+
+    public void setScreenResult(List<Map<String, Object>> screenResult) {
+        this.screenResult = screenResult;
+    }
+
     public String getPid() {
         return pid;
     }
-- 
1.8.3.1