liquanyu / regional-platform

Download as
Browse Code »

Commit 4ce232310b184e719238d7eea1f1201100bd296a

Authored by jiangjiazhi
2 parents 62f7e8aa15 3d7d311f38
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 17 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java View file @ 4ce2323
... ... @@ -26,6 +26,8 @@
26 26 private Date buildDate;
27 27 private String babyPatientId;
28 28 private String babyEarId;
  29 + //儿童姓名、母亲证件号、母亲联系方式
  30 + private String queryNo;
29 31 /**
30 32 * 生日
31 33 */
... ... @@ -55,6 +57,13 @@
55 57 return id;
56 58 }
57 59  
  60 + public String getQueryNo() {
  61 + return queryNo;
  62 + }
  63 +
  64 + public void setQueryNo(String queryNo) {
  65 + this.queryNo = queryNo;
  66 + }
58 67  
59 68 public void setId(String id) {
60 69 this.id = id;
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java View file @ 4ce2323
... ... @@ -102,6 +102,10 @@
102 102 */
103 103 private String ifcloseStr;
104 104 /**
  105 + * 结案结论
  106 + */
  107 + private String verdict;
  108 + /**
105 109 * 医院ID
106 110 */
107 111 private String hospitalId;
... ... @@ -133,6 +137,14 @@
133 137  
134 138 public Integer getIsAudiphone() {
135 139 return isAudiphone;
  140 + }
  141 +
  142 + public String getVerdict() {
  143 + return verdict;
  144 + }
  145 +
  146 + public void setVerdict(String verdict) {
  147 + this.verdict = verdict;
136 148 }
137 149  
138 150 public void setIsAudiphone(Integer isAudiphone) {
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java View file @ 4ce2323
... ... @@ -92,6 +92,10 @@
92 92 */
93 93 private Integer ifclose;
94 94 /**
  95 + * 结案结论
  96 + */
  97 + private String verdict;
  98 + /**
95 99 * 医院ID
96 100 */
97 101 private String hospitalId;
... ... @@ -149,6 +153,14 @@
149 153  
150 154 public void setIsOperation(Integer isOperation) {
151 155 this.isOperation = isOperation;
  156 + }
  157 +
  158 + public String getVerdict() {
  159 + return verdict;
  160 + }
  161 +
  162 + public void setVerdict(String verdict) {
  163 + this.verdict = verdict;
152 164 }
153 165  
154 166 public Integer getIsArtifiCochlea() {
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml View file @ 4ce2323
... ... @@ -2,191 +2,216 @@
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 3 <mapper namespace="com.lyms.platform.permission.dao.master.BabyPatientExtendEarBabyMapper">
4 4  
5   -<resultMap id="BabyPatientExtendEarBabyResultMap" type="com.lyms.platform.permission.model.BabyPatientExtendEarBaby">
6   -<id column="id" property="id" jdbcType="VARCHAR" />
7   -<result column="name" property="name" jdbcType="VARCHAR" />
8   -<result column="sex" property="sex" jdbcType="INTEGER" />
9   -<result column="cardNo" property="cardno" jdbcType="VARCHAR" />
10   -<result column="birth" property="birth" jdbcType="TIMESTAMP" />
11   -<result column="mname" property="mname" jdbcType="VARCHAR" />
12   -<result column="mcert_type_id" property="mcertTypeId" jdbcType="VARCHAR" />
13   -<result column="mcert_no" property="mcertNo" jdbcType="VARCHAR" />
14   -<result column="mphone" property="mphone" jdbcType="VARCHAR" />
15   -<result column="vc_card_no" property="vcCardNo" jdbcType="VARCHAR" />
16   -<result column="build_doctor" property="buildDoctor" jdbcType="VARCHAR" />
17   -<result column="hospital_id" property="hospitalId" jdbcType="VARCHAR" />
18   -<result column="build_type" property="buildType" jdbcType="INTEGER" />
19   -<result column="enable" property="enable" jdbcType="VARCHAR" />
20   -<result column="yn" property="yn" jdbcType="INTEGER" />
21   -<result column="build_date" property="buildDate" jdbcType="TIMESTAMP" />
22   -<result column="baby_patient_id" property="babyPatientId" jdbcType="VARCHAR" />
23   -<result column="baby_ear_id" property="babyEarId" jdbcType="VARCHAR" />
24   -</resultMap>
  5 + <resultMap id="BabyPatientExtendEarBabyResultMap"
  6 + type="com.lyms.platform.permission.model.BabyPatientExtendEarBaby">
  7 + <id column="id" property="id" jdbcType="VARCHAR"/>
  8 + <result column="name" property="name" jdbcType="VARCHAR"/>
  9 + <result column="sex" property="sex" jdbcType="INTEGER"/>
  10 + <result column="cardNo" property="cardno" jdbcType="VARCHAR"/>
  11 + <result column="birth" property="birth" jdbcType="TIMESTAMP"/>
  12 + <result column="mname" property="mname" jdbcType="VARCHAR"/>
  13 + <result column="mcert_type_id" property="mcertTypeId" jdbcType="VARCHAR"/>
  14 + <result column="mcert_no" property="mcertNo" jdbcType="VARCHAR"/>
  15 + <result column="mphone" property="mphone" jdbcType="VARCHAR"/>
  16 + <result column="vc_card_no" property="vcCardNo" jdbcType="VARCHAR"/>
  17 + <result column="build_doctor" property="buildDoctor" jdbcType="VARCHAR"/>
  18 + <result column="hospital_id" property="hospitalId" jdbcType="VARCHAR"/>
  19 + <result column="build_type" property="buildType" jdbcType="INTEGER"/>
  20 + <result column="enable" property="enable" jdbcType="VARCHAR"/>
  21 + <result column="yn" property="yn" jdbcType="INTEGER"/>
  22 + <result column="build_date" property="buildDate" jdbcType="TIMESTAMP"/>
  23 + <result column="baby_patient_id" property="babyPatientId" jdbcType="VARCHAR"/>
  24 + <result column="baby_ear_id" property="babyEarId" jdbcType="VARCHAR"/>
  25 + </resultMap>
25 26  
26 27  
27   -
28   -<insert id="addBabyPatientExtendEarBaby" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBaby">
  28 + <insert id="addBabyPatientExtendEarBaby"
  29 + parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBaby">
29 30 insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id) values (#{id},#{name},#{sex},#{cardno},#{birth},#{mname},#{mcertTypeId},#{mcertNo},#{mphone},#{vcCardNo},#{buildDoctor},#{hospitalId},#{buildType},#{enable},#{yn},#{buildDate},#{babyPatientId},#{babyEarId})
30 31 </insert>
31 32  
32 33  
  34 + <update id="updateBabyPatientExtendEarBaby"
  35 + parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBaby">
  36 + update baby_patient_extend_ear_baby
  37 + <set>
  38 + <if test="name != null and name != ''">
  39 + name = #{name,jdbcType=VARCHAR},
  40 + </if>
  41 + <if test="sex != null and sex >= 0">
  42 + sex = #{sex,jdbcType=INTEGER},
  43 + </if>
  44 + <if test="cardno != null and cardno != ''">
  45 + cardNo = #{cardno,jdbcType=VARCHAR},
  46 + </if>
  47 + <if test="birth != null">
  48 + birth = #{birth,jdbcType=TIMESTAMP},
  49 + </if>
  50 + <if test="mname != null and mname != ''">
  51 + mname = #{mname,jdbcType=VARCHAR},
  52 + </if>
  53 + <if test="mcertTypeId != null and mcertTypeId != ''">
  54 + mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR},
  55 + </if>
  56 + <if test="mcertNo != null and mcertNo != ''">
  57 + mcert_no = #{mcertNo,jdbcType=VARCHAR},
  58 + </if>
  59 + <if test="mphone != null and mphone != ''">
  60 + mphone = #{mphone,jdbcType=VARCHAR},
  61 + </if>
  62 + <if test="vcCardNo != null and vcCardNo != ''">
  63 + vc_card_no = #{vcCardNo,jdbcType=VARCHAR},
  64 + </if>
  65 + <if test="buildDoctor != null and buildDoctor != ''">
  66 + build_doctor = #{buildDoctor,jdbcType=VARCHAR},
  67 + </if>
  68 + <if test="hospitalId != null and hospitalId != ''">
  69 + hospital_id = #{hospitalId,jdbcType=VARCHAR},
  70 + </if>
  71 + <if test="buildType != null and buildType >= 0">
  72 + build_type = #{buildType,jdbcType=INTEGER},
  73 + </if>
  74 + <if test="enable != null and enable != ''">
  75 + enable = #{enable,jdbcType=VARCHAR},
  76 + </if>
  77 + <if test="yn != null and yn >= 0">
  78 + yn = #{yn,jdbcType=INTEGER},
  79 + </if>
  80 + <if test="buildDate != null">
  81 + build_date = #{buildDate,jdbcType=TIMESTAMP},
  82 + </if>
  83 + <if test="babyPatientId != null and babyPatientId != ''">
  84 + baby_patient_id = #{babyPatientId,jdbcType=VARCHAR},
  85 + </if>
  86 + <if test="babyEarId != null and babyEarId != ''">
  87 + baby_ear_id = #{babyEarId,jdbcType=VARCHAR},
  88 + </if>
  89 + </set>
  90 + where id = #{id,jdbcType=VARCHAR}
  91 + </update>
33 92  
34   -<update id="updateBabyPatientExtendEarBaby" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBaby">
35   -update baby_patient_extend_ear_baby <set><if test="name != null and name != ''">
36   -name = #{name,jdbcType=VARCHAR},
37   -</if>
38   -<if test="sex != null and sex >= 0">
39   -sex = #{sex,jdbcType=INTEGER},
40   -</if>
41   -<if test="cardno != null and cardno != ''">
42   -cardNo = #{cardno,jdbcType=VARCHAR},
43   -</if>
44   -<if test="birth != null">
45   -birth = #{birth,jdbcType=TIMESTAMP},
46   -</if>
47   -<if test="mname != null and mname != ''">
48   -mname = #{mname,jdbcType=VARCHAR},
49   -</if>
50   -<if test="mcertTypeId != null and mcertTypeId != ''">
51   -mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR},
52   -</if>
53   -<if test="mcertNo != null and mcertNo != ''">
54   -mcert_no = #{mcertNo,jdbcType=VARCHAR},
55   -</if>
56   -<if test="mphone != null and mphone != ''">
57   -mphone = #{mphone,jdbcType=VARCHAR},
58   -</if>
59   -<if test="vcCardNo != null and vcCardNo != ''">
60   -vc_card_no = #{vcCardNo,jdbcType=VARCHAR},
61   -</if>
62   -<if test="buildDoctor != null and buildDoctor != ''">
63   -build_doctor = #{buildDoctor,jdbcType=VARCHAR},
64   -</if>
65   -<if test="hospitalId != null and hospitalId != ''">
66   -hospital_id = #{hospitalId,jdbcType=VARCHAR},
67   -</if>
68   -<if test="buildType != null and buildType >= 0">
69   -build_type = #{buildType,jdbcType=INTEGER},
70   -</if>
71   -<if test="enable != null and enable != ''">
72   -enable = #{enable,jdbcType=VARCHAR},
73   -</if>
74   -<if test="yn != null and yn >= 0">
75   -yn = #{yn,jdbcType=INTEGER},
76   -</if>
77   -<if test="buildDate != null">
78   -build_date = #{buildDate,jdbcType=TIMESTAMP},
79   -</if>
80   -<if test="babyPatientId != null and babyPatientId != ''">
81   -baby_patient_id = #{babyPatientId,jdbcType=VARCHAR},
82   -</if>
83   -<if test="babyEarId != null and babyEarId != ''">
84   -baby_ear_id = #{babyEarId,jdbcType=VARCHAR},
85   -</if>
86   -</set>
87   -where id = #{id,jdbcType=VARCHAR}
88   -</update>
89 93  
90   -
91   -<delete id="deleteBabyPatientExtendEarBaby" parameterType="java.lang.String">
  94 + <delete id="deleteBabyPatientExtendEarBaby" parameterType="java.lang.String">
92 95 delete from baby_patient_extend_ear_baby where id = #{id,jdbcType=VARCHAR}
93 96 </delete>
94 97  
95 98  
96   -
97   -<select id="getBabyPatientExtendEarBaby" resultMap="BabyPatientExtendEarBabyResultMap" parameterType="java.lang.String">
  99 + <select id="getBabyPatientExtendEarBaby" resultMap="BabyPatientExtendEarBabyResultMap"
  100 + parameterType="java.lang.String">
98 101 select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id
99 102 from baby_patient_extend_ear_baby where id = #{id,jdbcType=VARCHAR}
100 103 </select>
101 104  
102 105  
103   -<sql id="orderAndLimit">
104   -<if test="sort != null and sort != '' ">
105   -order by ${sort}
106   -<if test="need != null">
107   -limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
108   -</if>
109   -</if>
110   -</sql>
  106 + <sql id="orderAndLimit">
  107 + <if test="sort != null and sort != '' ">
  108 + order by ${sort}
  109 + <if test="need != null">
  110 + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
  111 + </if>
  112 + </if>
  113 + </sql>
111 114  
112 115  
  116 + <sql id="BabyPatientExtendEarBabyCondition">
  117 + <where>
  118 + 1 = 1
  119 + <if test="id != null and id != ''">
  120 + and id = #{id,jdbcType=VARCHAR}
  121 + </if>
  122 + <if test="name != null and name != ''">
  123 + and name = #{name,jdbcType=VARCHAR}
  124 + </if>
  125 + <if test="queryNo != null and queryNo != ''">
  126 + and (
  127 + name LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%")
  128 + or
  129 + mcert_no LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%")
  130 + or
  131 + mphone LIKE concat(#{queryNo,jdbcType=VARCHAR},"%")
  132 + or
  133 + cardno LIKE concat(#{queryNo,jdbcType=VARCHAR},"%")
  134 + )
  135 + </if>
  136 + <if test="sex != null and sex >= 0">
  137 + and sex = #{sex,jdbcType=INTEGER}
  138 + </if>
  139 + <if test="cardno != null and cardno != ''">
  140 + and cardNo = #{cardno,jdbcType=VARCHAR}
  141 + </if>
  142 + <if test="birth != null">
  143 + and birth = #{birth,jdbcType=TIMESTAMP}
  144 + </if>
  145 + <if test="birthStart!=null">
  146 + AND
  147 + <![CDATA[
  148 + DATEDIFF(#{birthStart},birth) <=0
  149 + ]]>
  150 + </if>
  151 + <if test="birthEnd!=null">
  152 + and
  153 + <![CDATA[
  154 + DATEDIFF(#{birthEnd},birth) >=0
  155 + ]]>
  156 + </if>
  157 + <if test="mname != null and mname != ''">
  158 + and mname = #{mname,jdbcType=VARCHAR}
  159 + </if>
  160 + <if test="mcertTypeId != null and mcertTypeId != ''">
  161 + and mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR}
  162 + </if>
  163 + <if test="mcertNo != null and mcertNo != ''">
  164 + and mcert_no = #{mcertNo,jdbcType=VARCHAR}
  165 + </if>
  166 + <if test="mphone != null and mphone != ''">
  167 + and mphone = #{mphone,jdbcType=VARCHAR}
  168 + </if>
  169 + <if test="vcCardNo != null and vcCardNo != ''">
  170 + and vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
  171 + </if>
  172 + <if test="buildDoctor != null and buildDoctor != ''">
  173 + and build_doctor = #{buildDoctor,jdbcType=VARCHAR}
  174 + </if>
  175 + <if test="hospitalId != null and hospitalId != ''">
  176 + and hospital_id = #{hospitalId,jdbcType=VARCHAR}
  177 + </if>
  178 + <if test="buildType != null and buildType >= 0">
  179 + and build_type = #{buildType,jdbcType=INTEGER}
  180 + </if>
  181 + <if test="enable != null and enable != ''">
  182 + and enable = #{enable,jdbcType=VARCHAR}
  183 + </if>
  184 + <if test="yn != null and yn >= 0">
  185 + and yn = #{yn,jdbcType=INTEGER}
  186 + </if>
  187 + <if test="buildDate != null">
  188 + and build_date = #{buildDate,jdbcType=TIMESTAMP}
  189 + </if>
  190 + <if test="babyPatientId != null and babyPatientId != ''">
  191 + and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}
  192 + </if>
  193 + <if test="babyEarId != null and babyEarId != ''">
  194 + and baby_ear_id = #{babyEarId,jdbcType=VARCHAR}
  195 + </if>
  196 + </where>
  197 + </sql>
113 198  
114   -<sql id="BabyPatientExtendEarBabyCondition">
115   -<where>
116   - 1 = 1
117   -<if test="id != null and id != ''">
118   -and id = #{id,jdbcType=VARCHAR}
119   -</if>
120   -<if test="name != null and name != ''">
121   -and name = #{name,jdbcType=VARCHAR}
122   -</if>
123   -<if test="sex != null and sex >= 0">
124   -and sex = #{sex,jdbcType=INTEGER}
125   -</if>
126   -<if test="cardno != null and cardno != ''">
127   -and cardNo = #{cardno,jdbcType=VARCHAR}
128   -</if>
129   -<if test="birth != null">
130   -and birth = #{birth,jdbcType=TIMESTAMP}
131   -</if>
132   -<if test="mname != null and mname != ''">
133   -and mname = #{mname,jdbcType=VARCHAR}
134   -</if>
135   -<if test="mcertTypeId != null and mcertTypeId != ''">
136   -and mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR}
137   -</if>
138   -<if test="mcertNo != null and mcertNo != ''">
139   -and mcert_no = #{mcertNo,jdbcType=VARCHAR}
140   -</if>
141   -<if test="mphone != null and mphone != ''">
142   -and mphone = #{mphone,jdbcType=VARCHAR}
143   -</if>
144   -<if test="vcCardNo != null and vcCardNo != ''">
145   -and vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
146   -</if>
147   -<if test="buildDoctor != null and buildDoctor != ''">
148   -and build_doctor = #{buildDoctor,jdbcType=VARCHAR}
149   -</if>
150   -<if test="hospitalId != null and hospitalId != ''">
151   -and hospital_id = #{hospitalId,jdbcType=VARCHAR}
152   -</if>
153   -<if test="buildType != null and buildType >= 0">
154   -and build_type = #{buildType,jdbcType=INTEGER}
155   -</if>
156   -<if test="enable != null and enable != ''">
157   -and enable = #{enable,jdbcType=VARCHAR}
158   -</if>
159   -<if test="yn != null and yn >= 0">
160   -and yn = #{yn,jdbcType=INTEGER}
161   -</if>
162   -<if test="buildDate != null">
163   -and build_date = #{buildDate,jdbcType=TIMESTAMP}
164   -</if>
165   -<if test="babyPatientId != null and babyPatientId != ''">
166   -and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}
167   -</if>
168   -<if test="babyEarId != null and babyEarId != ''">
169   -and baby_ear_id = #{babyEarId,jdbcType=VARCHAR}
170   -</if>
171   -</where>
172   -</sql>
173 199  
  200 + <select id="queryBabyPatientExtendEarBaby" resultMap="BabyPatientExtendEarBabyResultMap"
  201 + parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBabyQuery">
  202 + select
  203 + id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id
  204 + from baby_patient_extend_ear_baby
  205 + <include refid="BabyPatientExtendEarBabyCondition"/>
  206 + <include refid="orderAndLimit"/>
  207 + </select>
174 208  
175 209  
176   -<select id="queryBabyPatientExtendEarBaby" resultMap="BabyPatientExtendEarBabyResultMap" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBabyQuery">
177   -select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id
178   - from baby_patient_extend_ear_baby
179   -<include refid="BabyPatientExtendEarBabyCondition" />
180   -<include refid="orderAndLimit" />
181   -</select>
182   -
183   -
184   -
185   -<select id="queryBabyPatientExtendEarBabyCount" resultType="int" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBabyQuery">
186   -select count(1) from baby_patient_extend_ear_baby
187   -<include refid="BabyPatientExtendEarBabyCondition" />
188   -</select>
189   -
  210 + <select id="queryBabyPatientExtendEarBabyCount" resultType="int"
  211 + parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarBabyQuery">
  212 + select count(1) from baby_patient_extend_ear_baby
  213 + <include refid="BabyPatientExtendEarBabyCondition"/>
  214 + </select>
190 215  
191 216  
192 217 </mapper>
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml View file @ 4ce2323
... ... @@ -25,6 +25,7 @@
25 25 <result column="month_age" property="monthAge" jdbcType="INTEGER"/>
26 26 <result column="ifdel" property="ifdel" jdbcType="INTEGER"/>
27 27 <result column="ifclose" property="ifclose" jdbcType="INTEGER"/>
  28 + <result column="verdict" property="verdict" jdbcType="VARCHAR"/>
28 29 <result column="hospital_id" property="hospitalId" jdbcType="VARCHAR"/>
29 30 <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
30 31 <result column="modify_id" property="modifyId" jdbcType="VARCHAR"/>
... ... @@ -36,7 +37,7 @@
36 37  
37 38 <insert id="addBabyPatientExtendEarFollowUp"
38 39 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUp">
39   - insert into baby_patient_extend_ear_follow_up (id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble) values (#{id},#{babyId},#{followTime},#{followAddr},#{markTime},#{markResult},#{markDetail},#{followInfo},#{audiphone},#{operation},#{artifiCochlea},#{isAudiphone},#{isOperation},#{isArtifiCochlea},#{guideOpinion},#{followDoctorName},#{followDoctorId},#{nextTime},#{monthAge},#{ifdel},#{ifclose},#{hospitalId},#{modifyTime},#{modifyId},#{createTime},#{createId},#{enalble})
  40 + insert into baby_patient_extend_ear_follow_up (id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble) values (#{id},#{babyId},#{followTime},#{followAddr},#{markTime},#{markResult},#{markDetail},#{followInfo},#{audiphone},#{operation},#{artifiCochlea},#{isAudiphone},#{isOperation},#{isArtifiCochlea},#{guideOpinion},#{followDoctorName},#{followDoctorId},#{nextTime},#{monthAge},#{ifdel},#{ifclose},#{verdict},#{hospitalId},#{modifyTime},#{modifyId},#{createTime},#{createId},#{enalble})
40 41 </insert>
41 42  
42 43  
... ... @@ -104,6 +105,9 @@
104 105 <if test="ifclose != null and ifclose >= 0">
105 106 ifclose = #{ifclose,jdbcType=INTEGER},
106 107 </if>
  108 + <if test="verdict != null and verdict != ''">
  109 + verdict = #{verdict,jdbcType=VARCHAR},
  110 + </if>
107 111 <if test="hospitalId != null and hospitalId != ''">
108 112 hospital_id = #{hospitalId,jdbcType=VARCHAR},
109 113 </if>
... ... @@ -134,7 +138,7 @@
134 138  
135 139 <select id="getBabyPatientExtendEarFollowUp" resultMap="BabyPatientExtendEarFollowUpResultMap"
136 140 parameterType="java.lang.String">
137   -select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
  141 +select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
138 142 from baby_patient_extend_ear_follow_up where id = #{id,jdbcType=VARCHAR}
139 143 </select>
140 144  
... ... @@ -184,7 +188,7 @@
184 188 and mark_time = #{markTime,jdbcType=TIMESTAMP}
185 189 </if>
186 190 <if test="markResult != null and markResult != ''">
187   - and mark_result like concat("%,",#{markResult},",%")
  191 + and mark_result = #{markResult,jdbcType=VARCHAR}
188 192 </if>
189 193 <if test="markDetail != null and markDetail != ''">
190 194 and mark_detail = #{markDetail,jdbcType=VARCHAR}
191 195  
... ... @@ -227,10 +231,13 @@
227 231 <if test="ifclose != null and ifclose >= 0">
228 232 and ifclose = #{ifclose,jdbcType=INTEGER}
229 233 </if>
  234 + <if test="verdict != null and verdict != ''">
  235 + and verdict = #{verdict,jdbcType=VARCHAR}
  236 + </if>
230 237 <if test="hospitalId != null and hospitalId != ''">
231 238 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
232 239 </if>
233   - <if test="checkHospitalIds != null and checkHospitalIds != ''">
  240 + <if test="checkHospitalIds != null">
234 241 and hospital_id in
235 242 <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
236 243 #{item}
237 244  
238 245  
239 246  
240 247  
... ... @@ -258,25 +265,20 @@
258 265 <select id="queryBabyPatientExtendEarFollowUp" resultMap="BabyPatientExtendEarFollowUpResultMap"
259 266 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
260 267 select
261   - id,baby_id,max(follow_time) as
262   - follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
  268 + id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
263 269 from baby_patient_extend_ear_follow_up
264 270 <include refid="BabyPatientExtendEarFollowUpCondition"/>
265   - GROUP BY baby_id
266 271 <include refid="orderAndLimit"/>
267 272 </select>
268 273  
269 274 <select id="queryBabyPatientExtendEarFollowUpCount" resultType="int"
270 275 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
271   - select count(1) from (
272   - select * from baby_patient_extend_ear_follow_up
  276 + select count(1) from baby_patient_extend_ear_follow_up
273 277 <include refid="BabyPatientExtendEarFollowUpCondition"/>
274   - GROUP BY baby_id
275   - ) bpef
276 278 </select>
277 279  
278 280 <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
279   - select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
  281 + select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
280 282 from baby_patient_extend_ear_follow_up
281 283  
282 284 <where>
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml View file @ 4ce2323
... ... @@ -895,7 +895,7 @@
895 895  
896 896 <select id="getHdAndScreen" resultMap="BabyPatientExtendEarHearingDiagnoseResultMap"
897 897 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnoseQuery">
898   - select hd.id,hd.baby_id,max(hd.diagnose_time) diagnose_time,hd.high_factor,hd.confirm_result,hd.diagn_doctor_id,diagn_result,isconfirm,diagn_hand_sugge
  898 + select hd.id,hd.baby_id,hd.diagnose_time,diagnose_time,hd.high_factor,hd.confirm_result,hd.diagn_doctor_id,diagn_result,isconfirm,diagn_hand_sugge
899 899 from baby_patient_extend_ear_hearing_diagnose hd
900 900 <where>
901 901 1=1
... ... @@ -967,7 +967,6 @@
967 967 </foreach>
968 968 )
969 969 </if>
970   - group by baby_id
971 970 </where>
972 971 <include refid="orderAndLimit"/>
973 972 </select>
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml View file @ 4ce2323
... ... @@ -179,7 +179,7 @@
179 179 and baby_id = #{babyId,jdbcType=VARCHAR}
180 180 </if>
181 181 <if test="babyIds != null ">
182   - and baby_id not in
  182 + and baby_id in
183 183 <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
184 184 #{item}
185 185 </foreach>
186 186  
... ... @@ -322,10 +322,13 @@
322 322 #{item}
323 323 </foreach>
324 324 </if>
  325 + <if test="checkHospitalId != null and checkHospitalId != ''">
  326 + and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
  327 + </if>
325 328  
326 329 <if test="babyIds!=null">
327 330 and baby_id in (
328   - <foreach item="babyId" collection="babyIds" separator="," >
  331 + <foreach item="babyId" collection="babyIds" separator=",">
329 332 #{babyId}
330 333 </foreach>
331 334 )
... ... @@ -445,7 +448,6 @@
445 448 ]]>
446 449 </if>
447 450 </where>
448   - GROUP BY baby_id
449 451 </select>
450 452  
451 453  
... ... @@ -454,7 +456,112 @@
454 456 select
455 457 id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status
456 458 from baby_patient_extend_ear_screen
457   - <include refid="BabyPatientExtendEarScreenCondition"/>
  459 +
  460 + <where>
  461 + 1 = 1
  462 + <if test="id != null and id != ''">
  463 + and id = #{id,jdbcType=VARCHAR}
  464 + </if>
  465 + <if test="babyId != null and babyId != ''">
  466 + and baby_id = #{babyId,jdbcType=VARCHAR}
  467 + </if>
  468 + <if test="babyIds != null ">
  469 + and baby_id not in
  470 + <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
  471 + #{item}
  472 + </foreach>
  473 + </if>
  474 + <if test="screenType != null and screenType >= 0">
  475 + and screen_type = #{screenType,jdbcType=INTEGER}
  476 + </if>
  477 + <if test="checkHospitalIds != null ">
  478 + and check_hospital_id in
  479 + <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
  480 + #{item}
  481 + </foreach>
  482 + </if>
  483 + <if test="checkHospitalId != null and checkHospitalId != ''">
  484 + and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
  485 + </if>
  486 + <if test="screenDate != null">
  487 + and screen_date = #{screenDate,jdbcType=TIMESTAMP}
  488 + </if>
  489 + <if test="highRiskCause != null and highRiskCause != ''">
  490 + and high_risk_cause = #{highRiskCause,jdbcType=VARCHAR}
  491 + </if>
  492 + <if test="oaeLeft != null">
  493 + and oae_left = #{oaeLeft,jdbcType=INTEGER}
  494 + </if>
  495 + <if test="oaeRight != null">
  496 + and oae_right = #{oaeRight,jdbcType=INTEGER}
  497 + </if>
  498 + <if test="aabrLeft != null">
  499 + and aabr_left = #{aabrLeft,jdbcType=INTEGER}
  500 + </if>
  501 + <if test="aabrRight != null">
  502 + and aabr_right = #{aabrRight,jdbcType=INTEGER}
  503 + </if>
  504 + <if test="gjb2Del35 != null and gjb2Del35 >= 0">
  505 + and gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER}
  506 + </if>
  507 + <if test="gjb2Del176 != null and gjb2Del176 >= 0">
  508 + and gjb2_del_176 = #{gjb2Del176,jdbcType=INTEGER}
  509 + </if>
  510 + <if test="gjb2Del235 != null and gjb2Del235 >= 0">
  511 + and gjb2_del_235 = #{gjb2Del235,jdbcType=INTEGER}
  512 + </if>
  513 + <if test="gjb2Del299 != null and gjb2Del299 >= 0">
  514 + and gjb2_del_299 = #{gjb2Del299,jdbcType=INTEGER}
  515 + </if>
  516 + <if test="gjb3Slc26a4538 != null and gjb3Slc26a4538 >= 0">
  517 + and gjb3_slc26a4_538 = #{gjb3Slc26a4538,jdbcType=INTEGER}
  518 + </if>
  519 + <if test="gjb3Slc26a42168 != null and gjb3Slc26a42168 >= 0">
  520 + and gjb3_slc26a4_2168 = #{gjb3Slc26a42168,jdbcType=INTEGER}
  521 + </if>
  522 + <if test="gjb3Slc26a4Ivs7 != null and gjb3Slc26a4Ivs7 >= 0">
  523 + and gjb3_slc26a4_ivs7 = #{gjb3Slc26a4Ivs7,jdbcType=INTEGER}
  524 + </if>
  525 + <if test="processOptionType != null and processOptionType >= 0">
  526 + and process_option_type = #{processOptionType,jdbcType=INTEGER}
  527 + </if>
  528 + <if test="processOptionDesc != null and processOptionDesc != ''">
  529 + and process_option_desc = #{processOptionDesc,jdbcType=VARCHAR}
  530 + </if>
  531 + <if test="guidOpinion != null and guidOpinion != ''">
  532 + and guid_opinion = #{guidOpinion,jdbcType=VARCHAR}
  533 + </if>
  534 + <if test="checkDoctorId != null and checkDoctorId != ''">
  535 + and check_doctor_id = #{checkDoctorId,jdbcType=VARCHAR}
  536 + </if>
  537 + <if test="referralDate != null">
  538 + and referral_date = #{referralDate,jdbcType=TIMESTAMP}
  539 + </if>
  540 + <if test="createDate != null">
  541 + and create_date = #{createDate,jdbcType=TIMESTAMP}
  542 + </if>
  543 + <if test="createUserId != null and createUserId != ''">
  544 + and create_user_id = #{createUserId,jdbcType=VARCHAR}
  545 + </if>
  546 + <if test="createHospitalId != null and createHospitalId != ''">
  547 + and create_hospital_id = #{createHospitalId,jdbcType=VARCHAR}
  548 + </if>
  549 + <if test="nextCheckTime != null">
  550 + and next_check_time = #{nextCheckTime,jdbcType=TIMESTAMP}
  551 + </if>
  552 + <if test="lastUpdateDate != null">
  553 + and last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP}
  554 + </if>
  555 + <if test="lastUpdateUserId != null and lastUpdateUserId != ''">
  556 + and last_update_user_id = #{lastUpdateUserId,jdbcType=VARCHAR}
  557 + </if>
  558 + <if test="lastUpdateHospitalId != null and lastUpdateHospitalId != ''">
  559 + and last_update_hospital_id = #{lastUpdateHospitalId,jdbcType=VARCHAR}
  560 + </if>
  561 + <if test="status != null and status >= 0">
  562 + and status = #{status,jdbcType=INTEGER}
  563 + </if>
  564 + </where>
458 565 <include refid="orderAndLimit"/>
459 566 </select>
460 567  
461 568  
462 569  
463 570  
464 571  
... ... @@ -464,29 +571,29 @@
464 571 id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status
465 572 from baby_patient_extend_ear_screen
466 573 <where>
467   - (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1)
468   - and screen_type = 2
469   - <if test="screenStartDate!=null">
470   - and
471   - <![CDATA[
  574 + (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1)
  575 + and screen_type = 2
  576 + <if test="screenStartDate!=null">
  577 + and
  578 + <![CDATA[
472 579 DATEDIFF(#{screenStartDate},screen_date)<=0
473 580 ]]>
474   - </if>
475   - <if test="screenEndDate!=null">
476   - AND
477   - <![CDATA[
  581 + </if>
  582 + <if test="screenEndDate!=null">
  583 + AND
  584 + <![CDATA[
478 585 DATEDIFF(#{screenEndDate},screen_date) >=0
479 586 ]]>
480   - </if>
  587 + </if>
481 588 <if test="checkDoctorId!=null and checkDoctorId != ''">
482   - and check_doctor_id = #{checkDoctorId}
  589 + and check_doctor_id = #{checkDoctorId}
483 590 </if>
484 591 <if test="checkHospitalId != null and checkHospitalId != ''">
485 592 and check_hospital_id = #{checkHospitalId}
486 593 </if>
487 594 <if test="babyIds!=null">
488 595 and baby_id in (
489   - <foreach item="babyId" collection="babyIds" separator="," >
  596 + <foreach item="babyId" collection="babyIds" separator=",">
490 597 #{babyId}
491 598 </foreach>
492 599 )
... ... @@ -502,7 +609,8 @@
502 609 <include refid="BabyPatientExtendEarScreenCondition"/>
503 610 </select>
504 611  
505   - <select id="queryScrBabyIds" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery" resultType="String">
  612 + <select id="queryScrBabyIds" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery"
  613 + resultType="String">
506 614 select DISTINCT baby_id from baby_patient_extend_ear_screen sc
507 615 <where>
508 616 <if test="checkHospitalIds!=null">
platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java View file @ 4ce2323
1 1 package com.lyms.platform.common.enums;
2 2  
3 3 /**
4   - * 听力诊断列表
  4 + * 听力诊断枚举
5 5 * @auther yangfei
6 6 * @createTime 2017年05月15日 17时41分
7 7 * @discription
platform-common/src/main/java/com/lyms/platform/common/enums/SourceEnums.java View file @ 4ce2323
... ... @@ -8,7 +8,7 @@
8 8 public enum SourceEnums {
9 9 ISJA(1, "本院"),
10 10 ALL(4, "全部"),
11   - ISWJA(2, "*医院");
  11 + ISWJA(2, "外院");
12 12 private int id;
13 13 private String name;
14 14  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java View file @ 4ce2323
... ... @@ -17,12 +17,8 @@
17 17 import com.lyms.platform.operate.web.result.FollowUpOneResult;
18 18 import com.lyms.platform.operate.web.result.FrontEndResult;
19 19 import com.lyms.platform.permission.model.*;
20   -import com.lyms.platform.permission.service.BabyPatientExtendEarFollowUpService;
21   -import com.lyms.platform.permission.service.HighriskChangeHospitalService;
22   -import com.lyms.platform.permission.service.OrganizationService;
23   -import com.lyms.platform.permission.service.UsersService;
  20 +import com.lyms.platform.permission.service.*;
24 21 import com.lyms.platform.pojo.BabyModel;
25   -import com.lyms.platform.query.BabyModelQuery;
26 22 import org.apache.commons.collections.CollectionUtils;
27 23 import org.apache.commons.lang.StringUtils;
28 24 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -60,6 +56,8 @@
60 56 private BabyBookbuildingService babyBookbuildingService;
61 57 @Autowired
62 58 private BabyEarFacade babyEarFacade;
  59 + @Autowired
  60 + private BabyPatientExtendEarBabyService earBabyService;
63 61  
64 62 /**
65 63 * 根据babyId获取随访记录
66 64  
67 65  
... ... @@ -245,14 +243,15 @@
245 243  
246 244 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
247 245 if (StringUtils.isNotEmpty(fur.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
248   - BabyModelQuery babyQuery = new BabyModelQuery();
  246 + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
249 247 babyQuery.setQueryNo(fur.getKeyWord());
250   - //查询建档记录
251   - List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  248 + babyQuery.setHospitalId(hospitalId);
  249 + List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
  250 +
252 251 if(CollectionUtils.isNotEmpty(models)){
253 252 List<String> babyIds = new ArrayList<>();
254   - for(BabyModel babyModel:models){
255   - babyIds.add(babyModel.getId());
  253 + for(BabyPatientExtendEarBaby babyModel:models){
  254 + babyIds.add(babyModel.getBabyPatientId());
256 255 }
257 256 query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
258 257 }else{
259 258  
... ... @@ -305,11 +304,14 @@
305 304 outOrgids.add(hospitalId);
306 305 }
307 306  
  307 + if(CollectionUtils.isEmpty(outOrgids)){
  308 + return FrontEndResult.ini().setData(new ArrayList()).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  309 + }
  310 +
308 311 query.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()]));
309 312  
310 313 query.setKeyword(fur.getKeyWord());
311 314  
312   - // query.setMarkResult(fur.getMarkResult());
313 315 query.setIfclose(fur.getIfclose());
314 316  
315 317 StringBuffer sqlStr = new StringBuffer();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ 4ce2323
... ... @@ -21,8 +21,6 @@
21 21 import com.lyms.platform.permission.model.*;
22 22 import com.lyms.platform.permission.service.*;
23 23 import com.lyms.platform.pojo.BabyModel;
24   -import com.lyms.platform.pojo.Patients;
25   -import com.lyms.platform.query.PatientsQuery;
26 24 import org.apache.commons.collections.CollectionUtils;
27 25 import org.apache.commons.lang.StringUtils;
28 26 import org.springframework.beans.factory.annotation.Autowired;
29 27  
30 28  
31 29  
32 30  
... ... @@ -448,32 +446,26 @@
448 446  
449 447  
450 448 List<String> babyIds = new ArrayList<>();
451   - PatientsQuery patientsQuery = new PatientsQuery();
452 449  
453   - if (model.getBirthStartTime() != null) {//儿童出生开始日期
454   - patientsQuery.setBirthStart(model.getBirthStartTime());
  450 + BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
  451 + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
  452 + babyQuery.setQueryNo(model.getKeyWord());
  453 + babyQuery.setBirthStart(model.getBirthStartTime());
  454 + babyQuery.setBirthEnd(model.getBirthEndTime());
  455 + babyQuery.setHospitalId(hospitalId);
  456 + List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
  457 + if (CollectionUtils.isEmpty(models) && (StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() == null || model.getBirthEndTime() == null)) {
  458 + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
455 459 }
456 460  
457   - if (model.getBirthEndTime() != null) {//儿童出生结束日期
458   - patientsQuery.setBirthEnd(model.getBirthEndTime());
459   - }
460   -
461   - List<Patients> patientses = null;
462   - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) {
463   - patientsQuery.setQueryNo(model.getKeyWord());
464   - patientses = patientsService.queryPatient1(patientsQuery, "modified");
465   - }
466   -
467   - BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
468   - if (CollectionUtils.isNotEmpty(patientses)) {
469   - for (Patients pa : patientses) {
470   - babyIds.add(pa.getId());
  461 + if (CollectionUtils.isNotEmpty(models)) {
  462 + for (BabyPatientExtendEarBaby pa : models) {
  463 + babyIds.add(pa.getBabyPatientId());
471 464 }
472 465 screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
473   - } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) {
474   - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
475 466 }
476 467  
  468 +
477 469 //听筛开始时间
478 470 if (model.getSecrStartTime() != null) {
479 471 screenQuery.setScreenStartDate(model.getSecrStartTime());
480 472  
481 473  
... ... @@ -887,22 +879,18 @@
887 879 List<String> babyIds = new ArrayList<>();
888 880  
889 881 for (BabyPatientExtendEarBaby babyModel : babyModels) {
890   - babyIds.add(babyModel.getId());
  882 + babyIds.add(babyModel.getBabyPatientId());
891 883 }
892 884  
893   - //根据儿童条件查询如果为空
894   - if(CollectionUtils.isEmpty(babyIds)&&(model.getMonthAgeStart()!=null||model.getMonthAgeEnd()!=null||StringUtils.isNotEmpty(model.getKeyWord())||model.getBirthStartTime()!=null||model.getBirthEndTime()!=null)){
  885 +
  886 +//根据儿童条件查询如果为空
  887 + if (CollectionUtils.isEmpty(babyIds) && (model.getMonthAgeStart() != null || model.getMonthAgeEnd() != null || StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() != null || model.getBirthEndTime() != null)) {
895 888 BaseListResponse result = new BaseListResponse();
896 889 result.setData(new ArrayList());
897 890 result.setErrorcode(0);
898 891 return result;
899 892 }
900 893  
901   - BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
902   - earQuery.setCreateHospitalId(hospitalId);
903   - earQuery.setBabyPatientIds(babyIds.toArray(new String[babyIds.size()]));
904   - //查询听力儿童档案
905   - List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
906 894  
907 895 //查询儿童听筛记录
908 896 BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery();
... ... @@ -913,7 +901,7 @@
913 901 screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
914 902 screenQuery.setCheckHospitalId(hospitalId);
915 903 //查询全部数据
916   - List<BabyPatientExtendEarScreen> earScreens = screenService.notAuscultationBabyPatientExtendEarScreen(screenQuery);
  904 + List<BabyPatientExtendEarScreen> earScreens = screenService.queryBabyPatientExtendEarScreen(screenQuery);
917 905 Map<String, BabyPatientExtendEarScreen> screenMap = new HashMap<>();
918 906 if (CollectionUtils.isNotEmpty(earScreens)) {
919 907 for (BabyPatientExtendEarScreen es : earScreens) {
920 908  
... ... @@ -924,20 +912,17 @@
924 912  
925 913 //要返回的数据
926 914 List<HearDiagnManageListResult> hdmResult = new ArrayList<>();
927   - if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) {
928   - for (BabyPatientExtendEar ear : babyPatientExtendEars) {
  915 + if (CollectionUtils.isNotEmpty(babyModels)) {
  916 + for (BabyPatientExtendEarBaby ear : babyModels) {
929 917 HearDiagnManageListResult hdm = new HearDiagnManageListResult();
930   - BabyModel babyModel = babyService.getOneBabyById(ear.getBabyPatientId());
931   - if (babyModel != null) {
932   - hdm.setBabyName(babyModel.getName());
933   - hdm.setBabyId(ear.getBabyPatientId());
934   - hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
935   - hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
936   - hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
937   - hdm.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
938   - hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
939   - hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
940   - }
  918 + hdm.setBabyName(ear.getName());
  919 + hdm.setBabyId(ear.getBabyPatientId());
  920 + hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(ear.getMname()));
  921 + hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(ear.getMphone()));
  922 + hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(ear.getMphone()));
  923 + hdm.setMonthAge(DateUtil.getBabyMonthAge(ear.getBirth(), new Date()));
  924 + hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(ear.getBirth())));
  925 + hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(ear.getSex())));
941 926 BabyPatientExtendEarScreen es = screenMap.get(ear.getBabyPatientId());
942 927 if (es != null) {
943 928 hdm.setId(es.getId());
... ... @@ -958,8 +943,7 @@
958 943 result.setPageInfo(pageInfo);
959 944 result.setData(hdmResult);
960 945 return result;
961   - } else
962   - {
  946 + } else {
963 947 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据");
964 948 }
965 949 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 4ce2323
... ... @@ -20,7 +20,6 @@
20 20 import com.lyms.platform.permission.model.*;
21 21 import com.lyms.platform.permission.service.*;
22 22 import com.lyms.platform.pojo.BabyModel;
23   -import com.lyms.platform.query.BabyModelQuery;
24 23 import org.apache.commons.collections.CollectionUtils;
25 24 import org.apache.commons.lang.StringUtils;
26 25 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -62,6 +61,8 @@
62 61 private BabyBookbuildingService babyBookbuildingService;
63 62 @Autowired
64 63 private BabyEarFacade babyEarFacade;
  64 + @Autowired
  65 + private BabyPatientExtendEarBabyService earBabyService;
65 66  
66 67 /**
67 68 * 根据儿童id获取最后一次确诊结果
... ... @@ -149,7 +150,7 @@
149 150 behd.setConfirmTimeStr(DateUtil.getyyyy_MM_dd(behd.getConfirmTime()));
150 151 }
151 152  
152   - if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum
  153 + if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum
153 154 {
154 155 StringBuffer hfBuff = new StringBuffer();
155 156 List highArr = new ArrayList();
... ... @@ -160,8 +161,8 @@
160 161 String name = HighRiskEnum.getTitle(Integer.parseInt(hf));
161 162 hfBuff.append(name + "、");
162 163 JSONObject confiJo = new JSONObject();
163   - confiJo.put("id",hf);
164   - confiJo.put("name",name);
  164 + confiJo.put("id", hf);
  165 + confiJo.put("name", name);
165 166 highArr.add(confiJo);
166 167 }
167 168 }
168 169  
... ... @@ -191,15 +192,15 @@
191 192 if (StringUtils.isNotEmpty(hf)) {
192 193 String name = ConfirmedEnums.getTitle(Integer.parseInt(hf));
193 194 JSONObject confiJo = new JSONObject();
194   - confiJo.put("id",hf);
195   - confiJo.put("name",name);
  195 + confiJo.put("id", hf);
  196 + confiJo.put("name", name);
196 197 confiArr.add(confiJo);
197 198 hfBuff.append(name + "、");
198 199 }
199 200 }
200 201 behd.setConfirmResults(confiArr);
201 202 behd.setConfirmResultStr(hfBuff.toString());
202   - }else{
  203 + } else {
203 204 behd.setConfirmResults(new ArrayList());
204 205 }
205 206  
206 207  
207 208  
... ... @@ -212,19 +213,19 @@
212 213 if (StringUtils.isNotEmpty(hf)) {
213 214 String name = HearingDiagnosisEnums.getTitle(Integer.parseInt(hf));
214 215 JSONObject confiJo = new JSONObject();
215   - confiJo.put("id",hf);
216   - confiJo.put("name",name);
  216 + confiJo.put("id", hf);
  217 + confiJo.put("name", name);
217 218 diagnArr.add(confiJo);
218 219 hfBuff.append(name + "、");
219 220 }
220 221 }
221 222 behd.setDiagnResultStr(hfBuff.toString());
222 223 behd.setDiagnResults(diagnArr);
223   - }else{
  224 + } else {
224 225 behd.setConfirmResults(new ArrayList());
225 226 }
226 227  
227   - if(behd.getDiagnHandSugge()!=null){
  228 + if (behd.getDiagnHandSugge() != null) {
228 229 behd.setDiagnHandSuggeStr(HdEnums.getHsTitle(behd.getDiagnHandSugge()));
229 230 }
230 231  
... ... @@ -290,6 +291,7 @@
290 291  
291 292 /**
292 293 * 获取听力诊断记录列表
  294 + *
293 295 * @param hdReq 听力诊断记录对象 多条件查询
294 296 * @param request
295 297 * @return
... ... @@ -309,7 +311,7 @@
309 311 //医院ID 集合。本院、外院、全部...
310 312 List<String> outOrgids = new ArrayList<>();
311 313 if (hdReq.getSource() != null) {
312   - if (hdReq.getSource() == 2) {//2.转诊过来的医院、
  314 + if (hdReq.getSource() == 2) {//2.外院
313 315 //转诊过来的医院id
314 316 HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
315 317 hchQuery.setTargetType(2);//儿童
316 318  
317 319  
318 320  
319 321  
320 322  
... ... @@ -339,38 +341,35 @@
339 341 hchQuery.setIntoOrgid(hospitalId);
340 342 List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
341 343 if (hchList != null && hchList.size() > 0) {
342   - for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
  344 + for (HighriskChangeHospital hch : hchList) {
343 345 outOrgids.add(hch.getOutOrgid());
344 346 }
345 347 }
346 348 }
347 349 } else {
348   - //当前登录人区域医院Id
349   - List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId);
350   - outOrgids.addAll(hospiIds);
351 350 //当前医院
352 351 outOrgids.add(hospitalId);
353 352 }
354 353 BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery();
355 354 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
356 355 if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId
357   - BabyModelQuery babyQuery = new BabyModelQuery();
  356 + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
358 357 babyQuery.setQueryNo(hdReq.getKeyWord());
359   - //查询建档记录
360   - List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
361   - if(CollectionUtils.isNotEmpty(models)){
362   - List<String> babyIds = new ArrayList<>();
363   - for(BabyModel babyModel:models){
364   - babyIds.add(babyModel.getId());
  358 + babyQuery.setHospitalId(hospitalId);
  359 + List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
  360 + if (CollectionUtils.isNotEmpty(models)) {
  361 + List<String> babyIds = new ArrayList<>();
  362 + for (BabyPatientExtendEarBaby babyModel : models) {
  363 + babyIds.add(babyModel.getBabyPatientId());
365 364 }
366 365 scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
367   - }else{
  366 + } else {
368 367 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
369 368 }
370 369 }
371 370  
372 371 scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()]));
373   - if(scrQuery.getCheckHospitalIds()==null||scrQuery.getCheckHospitalIds().length==0){
  372 + if (scrQuery.getCheckHospitalIds() == null || scrQuery.getCheckHospitalIds().length == 0) {
374 373 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
375 374 }
376 375 //主数据
377 376  
... ... @@ -483,7 +482,22 @@
483 482 hd.setBabyId(babyIds.get(i));
484 483 int index1 = Collections.binarySearch(hearingDiagnoseList, hd, new MyComparator());
485 484 HearingDiagnoseListResult hea = new HearingDiagnoseListResult();
  485 + BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
  486 + if (babyModel != null) {
  487 + hea.setBabyName(babyModel.getName());
  488 + hea.setBabyId(hd.getBabyId());
  489 + hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
  490 + hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
  491 + hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
  492 + hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
  493 + hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
  494 + hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
  495 + }
486 496 if (index1 < 0) {
  497 + //全部
  498 + hdrList.add(hea);
  499 + //待诊断
  500 + waitConfiList.add(hea);
487 501 continue;
488 502 }
489 503 if (index1 >= 0) {
... ... @@ -492,7 +506,7 @@
492 506 hea.setId(hd.getId());
493 507 hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()));
494 508 String docotorId = hd.getDiagnDoctorId();
495   - Users users = usersService.getUsers(Integer.parseInt(docotorId==null?"0":docotorId));
  509 + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId));
496 510 if (users != null) {
497 511 hea.setDoctorName(users.getName() == null ? "-" : users.getName());
498 512 }
... ... @@ -507,7 +521,7 @@
507 521 String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b]));
508 522 map.put(Integer.parseInt(hf[b]), title);
509 523 // highRiskEnums.add(map);
510   - hrSb.append(title+",");
  524 + hrSb.append(title + ",");
511 525 }
512 526 }
513 527 // hea.setHighRiskEnums(highRiskEnums);
514 528  
515 529  
516 530  
... ... @@ -516,32 +530,36 @@
516 530 //确诊结果
517 531 if (hd.getConfirmResult() != null) {
518 532 String cr[] = hd.getConfirmResult().split(",");
519   - // List<Map<Integer, String>> hdEnums = new ArrayList<>();
520 533 StringBuffer hdSb = new StringBuffer();
521 534 for (int b = 0; b < cr.length; b++) {
522 535 if (StringUtils.isNotEmpty(cr[b])) {
523 536 Map<Integer, String> map = new HashMap<>();
524 537 String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
525 538 map.put(Integer.parseInt(cr[b]), title);
526   - // hdEnums.add(map);
527   - hdSb.append(title+"，");
  539 + hdSb.append(title + "，");
528 540 }
529 541 }
530 542 // hea.setDiagnResult(hdEnums);
  543 + hea.setConfirmResult(hdSb.toString());
  544 + }
  545 +
  546 + //诊断结果
  547 + if (hd.getDiagnResult() != null) {
  548 + String cr[] = hd.getDiagnResult().split(",");
  549 + StringBuffer hdSb = new StringBuffer();
  550 + for (int b = 0; b < cr.length; b++) {
  551 + if (StringUtils.isNotEmpty(cr[b])) {
  552 + Map<Integer, String> map = new HashMap<>();
  553 + String title = HearingDiagnosisEnums.getTitle(Integer.parseInt(cr[b]));
  554 + map.put(Integer.parseInt(cr[b]), title);
  555 + hdSb.append(title + "，");
  556 + }
  557 + }
531 558 hea.setDiagnResult(hdSb.toString());
532 559 }
533 560 }
534   - BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
535   - if (babyModel != null) {
536   - hea.setBabyName(babyModel.getName());
537   - hea.setBabyId(hd.getBabyId());
538   - hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname()));
539   - hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone()));
540   - hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
541   - hea.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
542   - hea.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
543   - hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
544   - }
  561 +
  562 +
545 563 //诊断结果，肯定是有诊断记录
546 564 if (hdReq.getConfirmResult() != null || hdReq.getConfirmDegree() != null) {
547 565 // 1、已诊断、2、待诊断、0、全部
... ... @@ -623,7 +641,7 @@
623 641 //医院id
624 642 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
625 643 BabyPatientExtendEarHearingDiagnose hearDiag = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(obj.getId());
626   - if (hearDiag == null||hearDiag.getIfdel()!=0) {//没有找到数据
  644 + if (hearDiag == null || hearDiag.getIfdel() != 0) {//没有找到数据
627 645 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要删除的数据");
628 646 }
629 647  
630 648  
631 649  
... ... @@ -632,18 +650,18 @@
632 650 earHearingDiagnoseQuery.setBabyId(hearDiag.getBabyId());
633 651 earHearingDiagnoseQuery.setSort("diagnose_time");
634 652 List<BabyPatientExtendEarHearingDiagnose> earHearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(earHearingDiagnoseQuery);
635   - if(CollectionUtils.isNotEmpty(earHearingDiagnoseList)){
636   - BabyPatientExtendEarHearingDiagnose earHearingDiagnose = earHearingDiagnoseList.get(earHearingDiagnoseList.size()-1);
637   - if(earHearingDiagnose.getId().equals(obj.getId())){
  653 + if (CollectionUtils.isNotEmpty(earHearingDiagnoseList)) {
  654 + BabyPatientExtendEarHearingDiagnose earHearingDiagnose = earHearingDiagnoseList.get(earHearingDiagnoseList.size() - 1);
  655 + if (earHearingDiagnose.getId().equals(obj.getId())) {
638 656 obj.setModifyId(String.valueOf(loginState.getId()));
639 657 obj.setModifyTime(new Date());
640 658 obj.setIfdel(1);
641 659 hearingDiagnoseService.updateBabyPatientExtendEarHearingDiagnose(obj);
642 660 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("删除成功");
643   - }else{
  661 + } else {
644 662 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("删除失败！只能删除最后一次听诊记录");
645 663 }
646   - }else{
  664 + } else {
647 665 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要删除的数据");
648 666 }
649 667 }
... ... @@ -726,6 +744,7 @@
726 744 hchQuery.setTargetType(2);
727 745 hchQuery.setTargetId(obj.getBabyId());
728 746 hchQuery.setIntoOrgid(hospitalId);
  747 + hchQuery.setStatus(1);
729 748 List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
730 749 if (hchList != null && hchList.size() > 0) {
731 750 for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
... ... @@ -739,7 +758,7 @@
739 758 }
740 759 //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案
741 760 //建立隐藏档案
742   - babyEarFacade.addhideBabyEar(obj.getBabyId(),hospitalId);
  761 + babyEarFacade.addhideBabyEar(obj.getBabyId(), hospitalId);
743 762  
744 763 BaseResponse result = new BaseResponse();
745 764 result.setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ 4ce2323
... ... @@ -522,7 +522,6 @@
522 522 if (StringUtil.isBlank(obj.getTargetId())) {
523 523 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
524 524 }
525   - obj.setApplyDoctorid(String.valueOf(loginState.getId()));
526 525 obj.setId(UUID.randomUUID().toString().replace("-", ""));
527 526 obj.setTargetType(2);//儿童
528 527 obj.setCreateTime(new Date());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 4ce2323
... ... @@ -94,10 +94,11 @@
94 94 private OrganizationGroupsFacade groupsFacade;
95 95 @Autowired
96 96 private BabyBookbuildingService babyBookbuildingService;
  97 + @Autowired
  98 + private BabyPatientExtendEarBabyService earBabyService;
97 99  
98 100  
99 101  
100   -
101 102 //处理儿童person信息
102 103 private PersonModel handBabyPerson(BabyModel baby) {
103 104 //跟距母親的證件號查詢兒童person信息
... ... @@ -195,12 +196,10 @@
195 196  
196 197 //建立儿童隐藏档案
197 198 if (babyModel != null) {
198   - if (babyModel.getYn() != YnEnums.YES.getId()) {
199   - babyModel.setYn(YnEnums.YES.getId());
200   - babyModel.setModified(new Date());
201   - babyModel.setEnable("1");
202   - babyService.updateOneBaby(babyModel, babyId);
203   - }
  199 + babyModel.setYn(YnEnums.YES.getId());
  200 + babyModel.setModified(new Date());
  201 + babyModel.setEnable("1");
  202 + babyService.updateOneBaby(babyModel, babyId);
204 203 }
205 204  
206 205 BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
... ... @@ -359,6 +358,7 @@
359 358 babyService.updateOneBaby(baby, babyModel.getId());
360 359 babyPatientId = babyModel.getId();
361 360 } else {//新增
  361 + baby.setId(null);
362 362 baby.setPid(pid);
363 363 baby.setHospitalId(hId);
364 364 baby.setYn(1);
365 365  
366 366  
367 367  
368 368  
... ... @@ -1635,22 +1635,19 @@
1635 1635 screenQuery.setNextEndTime(earScreenListRequest.getNextEndTime());
1636 1636 //当前登录人医院Id
1637 1637 String hospitalId = autoMatchFacade.getHospitalId(userId);
1638   - List hospitalIds = getOrgHospitalIds(hospitalId);
1639   - String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]);
1640   - screenQuery.setCheckHospitalIds(checkHospitalIds);
  1638 + screenQuery.setCheckHospitalId(hospitalId);
1641 1639  
1642 1640 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
1643 1641 if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId
1644   - BabyModelQuery babyQuery = new BabyModelQuery();
  1642 + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
1645 1643 babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
  1644 + babyQuery.setHospitalId(hospitalId);
1646 1645 babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime());
1647 1646 babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime());
1648   - babyQuery.setHospitalId(hospitalId);
1649   - //查询建档记录
1650   - List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  1647 + List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
1651 1648 if (CollectionUtils.isNotEmpty(models)) {
1652 1649 List<String> babyIds = new ArrayList<>();
1653   - for (BabyModel babyModel : models) {
  1650 + for (BabyPatientExtendEarBaby babyModel : models) {
1654 1651 babyIds.add(babyModel.getId());
1655 1652 }
1656 1653 screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
... ... @@ -1668,7 +1665,7 @@
1668 1665 BabyModel babyModel = babyService.getOneBabyById(earScreen.getBabyId());
1669 1666 if (babyModel != null) {
1670 1667 screenResult.setBabyName(babyModel.getName());
1671   - screenResult.setMommyName(babyModel.getName());
  1668 + screenResult.setMommyName(babyModel.getMname());
1672 1669 screenResult.setSex(SexEnum.getTextById(babyModel.getSex()));
1673 1670 screenResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), earScreen.getScreenDate()));
1674 1671 screenResult.setBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4ce2323
... ... @@ -1723,6 +1723,7 @@
1723 1723 map.put("diagnosis", diagnosis);
1724 1724 map.put("treatOpinion", data.getTreatOpinion());
1725 1725 map.put("dirOpinion", data.getDirOpinion());
  1726 + map.put("quicken", QuickenEnums.getName(data.getQuicken()));
1726 1727  
1727 1728 br.setErrorcode(ErrorCodeConstants.SUCCESS);
1728 1729 br.setErrormsg("成功");
1729 1730  
... ... @@ -1883,12 +1884,12 @@
1883 1884 List<Map> tireList = new ArrayList<>();
1884 1885 if (CollectionUtils.isNotEmpty(data.getTireData())) {
1885 1886 for (Object temp : data.getTireData()) {
1886   - Map<String, String> tire = (Map<String, String>) temp;
  1887 + Map<String, Object> tire = (Map<String, Object>) temp;
1887 1888 if (tire != null) {
1888   - String heartRate = tire.get("heartRate");
1889   - String fetalPosition = tire.get("fetalPosition");
1890   - String fetalPresentation = tire.get("fetalPresentation");
1891   - String join = tire.get("join");
  1889 + String heartRate = tire.get("heartRate") + "";
  1890 + String fetalPosition = tire.get("fetalPosition") + "";
  1891 + String fetalPresentation = tire.get("fetalPresentation") + "";
  1892 + String join = tire.get("join") + "";
1892 1893  
1893 1894 Map<String, Object> tireMap = new HashMap<>();
1894 1895 tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java View file @ 4ce2323
... ... @@ -25,6 +25,8 @@
25 25 private String diagnResult;
26 26 //是否确诊 0-待确诊，1-确诊
27 27 private String isconfirm;
  28 + //确诊结果
  29 + private String confirmResult;
28 30 //创建时间
29 31 private String diagnoseTime;
30 32 //医生名称
... ... @@ -35,6 +37,14 @@
35 37 private String mommnyEncryptPhone;
36 38 //听力高危集合
37 39 private String highRiskEnums;
  40 +
  41 + public String getConfirmResult() {
  42 + return confirmResult;
  43 + }
  44 +
  45 + public void setConfirmResult(String confirmResult) {
  46 + this.confirmResult = confirmResult;
  47 + }
38 48  
39 49 public String getBabyId() {
40 50 return babyId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 4ce2323
... ... @@ -244,7 +244,7 @@
244 244 for (String s : riskFactorId) {
245 245 EyeHighRiskEnums eyeHighRiskEnums = EyeHighRiskEnums.get(Integer.parseInt(s));
246 246 Map<String, Object> tempMap = new HashedMap();
247   - tempMap.put("id", eyeHighRiskEnums.getId());
  247 + tempMap.put("id", eyeHighRiskEnums.getId() + "");
248 248 tempMap.put("name", eyeHighRiskEnums.getName());
249 249 rest.add(tempMap);
250 250 }