From 6ddc0dc3576fc9d859d568654263df3ea7a090a5 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 8 Jun 2017 10:02:43 +0800
Subject: [PATCH] update

---
 .../main/resources/mainOrm/master/MasterLis.xml    | 310 +++++++++------------
 .../com/lyms/platform/common/utils/DateUtil.java   |   2 +
 .../platform/operate/web/facade/LisFacade.java     |   2 +-
 3 files changed, 131 insertions(+), 183 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index a96e262..7b3acb6 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -2,65 +2,65 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.lyms.platform.permission.dao.master.MasterLisMapper">
 
-    <insert id="saveLisData" parameterType="com.lyms.platform.permission.model.LisReportQuery">
+    <insert id="saveLisData" parameterType="com.lyms.platform.permission.model.LisReportModel">
         INSERT INTO LIS_REPORT_TBL(
-           LIS_ID,
-           TITLE,
-           TYPE,
-           VCCARDNO,
-           NAME,
-           BHNUM,
-           AGE,
-           SEX,
-           APPLY_TIME,
-           CHECK_TIME,
-           PUBLISH_TIME,
-           APPLY_DOCTOR,
-           APPLY_DEPT,
-           CHECKER,
-           MODIFIED,
-           CREATED,
-           HOSPITAL_ID,
-           PHONE,
-           ITEM_JSON,
-           STATUS
+        LIS_ID,
+        TITLE,
+        TYPE,
+        VCCARDNO,
+        NAME,
+        BHNUM,
+        AGE,
+        SEX,
+        APPLY_TIME,
+        CHECK_TIME,
+        PUBLISH_TIME,
+        APPLY_DOCTOR,
+        APPLY_DEPT,
+        CHECKER,
+        MODIFIED,
+        CREATED,
+        HOSPITAL_ID,
+        PHONE,
+        ITEM_JSON,
+        STATUS
         ) VALUES (
-          #{lisId},
-          #{title},
-          #{type},
-          #{vcCardNo},
-          #{name},
-          #{ bhnum},
-          #{age},
-          #{sex},
-          #{applyTime},
-          #{checkTime},
-          #{publishTime},
-          #{applyDoctor},
-          #{applyDept},
-          #{checker},
-          #{modified},
-          #{created},
-          #{hospitalId},
-          #{phone},
-          #{itemJson},
-          #{status}
+        #{lisId},
+        #{title},
+        #{type},
+        #{vcCardNo},
+        #{name},
+        #{ bhnum},
+        #{age},
+        #{sex},
+        #{applyTime},
+        #{checkTime},
+        #{publishTime},
+        #{applyDoctor},
+        #{applyDept},
+        #{checker},
+        #{modified},
+        #{created},
+        #{hospitalId},
+        #{phone},
+        #{itemJson},
+        #{status}
         )
 
     </insert>
 
     <insert id="saveLisItemsData" parameterType="java.util.List">
         insert into LIS_REPORT_ITEM_TBL (
-            LIS_ID,
-            CODE,
-            NAME,
-            RESULT,
-            RESULT_FLAG,
-            REF,
-            RESULT_TYPE,
-            UNIT,
-            PRINT_ORDER,
-            HOSPITAL_ID
+        LIS_ID,
+        CODE,
+        NAME,
+        RESULT,
+        RESULT_FLAG,
+        REF,
+        RESULT_TYPE,
+        UNIT,
+        PRINT_ORDER,
+        HOSPITAL_ID
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -83,106 +83,55 @@
         DELETE FROM LIS_REPORT_TBL WHERE LIS_ID = #{lisId} AND HOSPITAL_ID = #{hospitalId}
     </delete>
 
-    <select id="queryLisDataByModel" parameterType="com.lyms.platform.permission.model.LisReportModel"
+    <select id="queryLisDataByModel" parameterType="com.lyms.platform.permission.model.LisReportQuery"
             resultType="com.lyms.platform.permission.model.LisReportModel">
-           SELECT
-               ID AS id,
-               LIS_ID AS lisId,
-               TITLE AS title,
-               TYPE AS type,
-               VCCARDNO AS vcCardNo,
-               NAME AS name,
-               BHNUM AS bhnum,
-               AGE AS age,
-               SEX AS sex,
-               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,
-               HOSPITAL_ID AS hospitalId,
-               PHONE AS phone,
-               ITEM_JSON AS itemJson
-           FROM LIS_REPORT_TBL
-           WHERE  1 = 1
-            <if test="lisId != null and lisId != ''">
-                AND  LIS_ID = #{lisId}
-            </if>
-            <if test="vcCardNo != null">
-                AND VCCARDNO = #{vcCardNo}
-            </if>
-            <if test="vcCardNo == null">
-                AND VCCARDNO = ''
-            </if>
-            <if test="hospitalId != null and hospitalId != ''">
-                AND HOSPITAL_ID = #{hospitalId}
-            </if>
-
-            <if test="checkTime != null">
-                AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d')
-            </if>
-
-            <if test="titles.size() !=0 ">
-                AND TITLE IN
-                <foreach collection="titles" item="title"
-                         index="index" open="(" close=")" separator=",">
-                    #{title}
-                </foreach>
-            </if>
-
-
-            UNION
-            SELECT
-            ID AS id,
-            LIS_ID AS lisId,
-            TITLE AS title,
-            TYPE AS type,
-            VCCARDNO AS vcCardNo,
-            NAME AS name,
-            BHNUM AS bhnum,
-            AGE AS age,
-            SEX AS sex,
-            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,
-            HOSPITAL_ID AS hospitalId,
-            PHONE AS phone,
-            ITEM_JSON AS itemJson
-            FROM LIS_REPORT_TBL
-            WHERE  1 = 1
-            <if test="lisId != null and lisId != ''">
-                AND  LIS_ID = #{lisId}
-            </if>
-            <if test="phone != null">
-                AND  PHONE = #{phone}
-            </if>
-            <if test="phone == null">
-                AND  PHONE = ''
-            </if>
-            <if test="hospitalId != null and hospitalId != ''">
-                AND HOSPITAL_ID = #{hospitalId}
-            </if>
-
-            <if test="checkTime != null">
-                AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d')
-            </if>
+        SELECT
+        ID AS id,
+        LIS_ID AS lisId,
+        TITLE AS title,
+        TYPE AS type,
+        VCCARDNO AS vcCardNo,
+        NAME AS name,
+        BHNUM AS bhnum,
+        AGE AS age,
+        SEX AS sex,
+        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,
+        HOSPITAL_ID AS hospitalId,
+        PHONE AS phone,
+        ITEM_JSON AS itemJson
+        FROM LIS_REPORT_TBL
+        WHERE  1 = 1
+        <if test="lisId != null and lisId != ''">
+            AND  LIS_ID = #{lisId}
+        </if>
+        <if test="vcCardNo != null and vcCardNo != ''">
+            AND VCCARDNO = #{vcCardNo}
+        </if>
+        <if test="phone != null and phone != ''">
+            AND  PHONE = #{phone}
+        </if>
+        <if test="hospitalId != null and hospitalId != ''">
+            AND HOSPITAL_ID = #{hospitalId}
+        </if>
 
-            <if test="titles.size() !=0 ">
-                AND TITLE IN
-                <foreach collection="titles" item="title"
-                         index="index" open="(" close=")" separator=",">
-                    #{title}
-                </foreach>
-            </if>
+        <if test="checkTime != null">
+            AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d')
+        </if>
 
+        <if test="titles != null and titles.size() !=0 ">
+            AND TITLE IN
+            <foreach collection="titles" item="title"
+                     index="index" open="(" close=")" separator=",">
+                #{title}
+            </foreach>
+        </if>
     </select>
 
 
@@ -214,9 +163,6 @@
         <if test="lisId != null and lisId != ''">
             AND  LIS_ID = #{lisId}
         </if>
-        <if test="title != null and title != ''">
-            AND  TITLE = #{title}
-        </if>
         <if test="hospitalId != null and hospitalId != ''">
             AND HOSPITAL_ID = #{hospitalId}
         </if>
@@ -226,16 +172,16 @@
     <select id="queryLisItemByModel" parameterType="com.lyms.platform.permission.model.LisReportItemModel"
             resultType="com.lyms.platform.permission.model.LisReportItemModel">
         SELECT
-            LIS_ID,
-            CODE,
-            NAME,
-            RESULT,
-            RESULT_FLAG,
-            REF,
-            RESULT_TYPE,
-            UNIT,
-            PRINT_ORDER,
-            HOSPITAL_ID
+        LIS_ID,
+        CODE,
+        NAME,
+        RESULT,
+        RESULT_FLAG,
+        REF,
+        RESULT_TYPE,
+        UNIT,
+        PRINT_ORDER,
+        HOSPITAL_ID
         FROM LIS_REPORT_ITEM_TBL
         WHERE  1 = 1
         <if test="lisId != null and lisId != ''">
@@ -289,27 +235,27 @@
 
 
     <resultMap id="queryListItemsMap" type="com.lyms.platform.permission.model.LisReportModel" >
-             <id property="id" column="ID"/>
-             <result property="lisId" column="LIS_ID"/>
-             <result property="title" column="TITLE"/>
-             <result property="type" column="TYPE"/>
-             <result property="vcCardNo" column="VCCARDNO"/>
-             <result property="name" column="NAME"/>
-             <result property="bhnum" column="BHNUM"/>
-             <result property="age" column="AGE"/>
-             <result property="sex" column="SEX"/>
-             <result property="applyTime" column="APPLY_TIME"/>
-             <result property="checkTime" column="CHECK_TIME"/>
-             <result property="publishTime" column="PUBLISH_TIME"/>
-             <result property="applyDoctor" column="APPLY_DOCTOR"/>
-             <result property="applyDept" column="APPLY_DEPT"/>
-             <result property="checker" column="CHECKER"/>
-             <result property="modified" column="MODIFIED"/>
-             <result property="created" column="CREATED"/>
-             <result property="hospitalId" column="HOSPITAL_ID"/>
-             <result property="phone" column="PHONE"/>
-             <result property="itemJson" column="ITEM_JSON"/>
-             <result property="status" column="STATUS"/>
+        <id property="id" column="ID"/>
+        <result property="lisId" column="LIS_ID"/>
+        <result property="title" column="TITLE"/>
+        <result property="type" column="TYPE"/>
+        <result property="vcCardNo" column="VCCARDNO"/>
+        <result property="name" column="NAME"/>
+        <result property="bhnum" column="BHNUM"/>
+        <result property="age" column="AGE"/>
+        <result property="sex" column="SEX"/>
+        <result property="applyTime" column="APPLY_TIME"/>
+        <result property="checkTime" column="CHECK_TIME"/>
+        <result property="publishTime" column="PUBLISH_TIME"/>
+        <result property="applyDoctor" column="APPLY_DOCTOR"/>
+        <result property="applyDept" column="APPLY_DEPT"/>
+        <result property="checker" column="CHECKER"/>
+        <result property="modified" column="MODIFIED"/>
+        <result property="created" column="CREATED"/>
+        <result property="hospitalId" column="HOSPITAL_ID"/>
+        <result property="phone" column="PHONE"/>
+        <result property="itemJson" column="ITEM_JSON"/>
+        <result property="status" column="STATUS"/>
     </resultMap>
 
 
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index a0fe9ea..c62420b 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -895,5 +895,7 @@ public class DateUtil {
         Date start = parseYMD("2016-05-01");
         Date end = parseYMD("2016-05-11");
         System.out.println(getWeekDesc(start, end));
+        String s = DateUtil.getyyyy_MM_dd_hms(new Date(1496829600000L));
+        System.out.println(s);
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index 7195c8f..3c7f0d4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -442,7 +442,7 @@ public class LisFacade {
                         {
                             if (lis != null && reportModel != null)
                             {
-                                if (StringUtils.isNotEmpty(lis.getLisId()) && lis.getLisId().equals(reportModel.getLisId()))
+                                if (StringUtils.isNotEmpty(lis.getLisId()) && !lis.getLisId().equals(reportModel.getLisId()))
                                 {
                                     isExist = true;
                                     break;
-- 
1.8.3.1