From 54461f27181b8a9efbe482e16c67d26806fba92d Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Mon, 17 Jul 2017 14:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E4=BB=A3=E9=87=91?=
 =?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/hospitalapi/dzfy/DzfyHisService.java  | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
index f9a1323..4c37c08 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
@@ -4,6 +4,7 @@ import com.lyms.hospitalapi.pojo.*;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ExceptionUtils;
 import com.lyms.platform.pojo.LisReport;
+import com.lyms.platform.permission.model.LisReportModel;
 import com.lyms.platform.pojo.LisReportItem;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.dbutils.DbUtils;
@@ -237,30 +238,31 @@ public class DzfyHisService {
             Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection();
             QueryRunner queryRunner = new QueryRunner(true);
             try {
-                String sql = "select TYPE as classifyName,NAME as name,LIS_ID as hospitalId,BHNUM as patientHid,VCCARDNO as vcCardNo,SEX as sex,to_number(replace(AGE,'岁') ) as age,APPLY_DEPT as deptName,APPLY_DOCTOR as applyDoctorName,CHECKER as checkDoctorName,PUBLISH_TIME as publishTime  from zlhis.lis_report_info where VCCARDNO ='"+cardNo+"' order by LIS_ID desc";
+                String sql = "select LIS_ID as lisId,TITLE as title,TYPE as type,VCCARDNO as vcCardNo, NAME as name,BHNUM as bhnum,SEX as sex,to_number(replace(AGE,'岁') ) as age,APPLY_TIME as applyTime,CHECK_TIME as checkTime,PUBLISH_TIME as publishTime,APPLY_DOCTOR as applyDoctor,APPLY_DEPT as applyDept,CHECKER as checker,MODIFIED as modified,CREATED as created  from zlhis.lis_report_info where VCCARDNO ='"+cardNo+"' order by LIS_ID desc";
                 String subSql = "select LIS_ID as id,CODE as code,NAME as name,RESULT as result,RESULT_FLAG as flag,REF as ref,UNIT as unit,RESULT_TYPE as resultType from zlhis.lis_report_item where LIS_ID='";
-                List<LisReport> lisReportList = queryRunner.query(conn, sql, new BeanListHandler<LisReport>(LisReport.class));
+                List<LisReportModel> lisReportList = queryRunner.query(conn, sql, new BeanListHandler<LisReportModel>(LisReportModel.class));
                 List<LisCheckInfo> list = new ArrayList<>();
                 if (lisReportList.size() > 0) {
-                    for (LisReport lisReport:lisReportList) {
+                    for (LisReportModel lisReportModel:lisReportList) {
                         // hospitalId为申请号
-                        if (StringUtils.isNotBlank(lisReport.getHospitalId())) {
-                            List<LisReportItem> lisReportItemList = queryRunner.query(conn, subSql+lisReport.getHospitalId()+"'", new BeanListHandler<LisReportItem>(LisReportItem.class));
+                        if (StringUtils.isNotBlank(lisReportModel.getLisId())) {
+                            List<LisReportItem> lisReportItemList = queryRunner.query(conn, subSql+lisReportModel.getLisId()+"'", new BeanListHandler<LisReportItem>(LisReportItem.class));
                             if (lisReportItemList != null && lisReportItemList.size() > 0) {
                                 CheckResponse check = new CheckResponse();
-                                check.setModified(lisReport.getPublishTime());
+                                check.setModified(lisReportModel.getPublishTime());
                                 check.setType(1);
-                                check.setName(lisReport.getName());
-                                check.setTitle(lisReport.getClassifyName());
+                                check.setName(lisReportModel.getName());
+                                check.setTitle(lisReportModel.getTitle());
                                 check.setHospitalName("德州市妇幼保健院");//新增医院名称字段赋值
-                                if (lisReport.getAge() != null) {
-                                    check.setAge(lisReport.getAge().toString());
+                                if (lisReportModel.getAge() != null) {
+                                    check.setAge(lisReportModel.getAge());
                                 }
-                                check.setApplyDate(lisReport.getPublishTime());
-                                check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lisReport.getPublishTime()));
-                                check.setCheckDept(lisReport.getDeptName());
-                                check.setDoctor(lisReport.getApplyDoctorName());
-                                check.setSex(lisReport.getSex());
+                                check.setApplyDate(lisReportModel.getApplyTime());
+                                check.setApplyDateStr(DateUtil.getyyyy_MM_dd(lisReportModel.getApplyTime()));
+                                check.setCheckDept(lisReportModel.getApplyDept());
+                                check.setDoctor(lisReportModel.getApplyDoctor());
+                                check.setSex(lisReportModel.getSex());
+                                check.setModified(lisReportModel.getModified());
                                 List<CheckItemResponse> itemList = new ArrayList<>();
                                 check.setItemList(itemList);
                                 for (LisReportItem checkItem:lisReportItemList) {
-- 
1.8.3.1