jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f902b7d6bfe454a2e239f60c6e79e92b762d888f

Authored by wangbo
1 parent 42d435cf33
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

出院诊断修改

Showing 10 changed files with 345 additions and 172 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java View file @ f902b7d
1 1 package com.lyms.platform.permission.dao.master;
2 2  
  3 +import com.lyms.platform.permission.model.BabyDiagnoseQuery;
3 4 import com.lyms.platform.pojo.BabyDiagnoseModel;
4 5  
5 6 import java.util.List;
... ... @@ -14,5 +15,9 @@
14 15 List<BabyDiagnoseModel> queryBabyDiagnoses(Map param);
15 16  
16 17 void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel);
  18 +
  19 + List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query);
  20 +
  21 +
17 22 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyDiagnoseQuery.java View file @ f902b7d
  1 +package com.lyms.platform.permission.model;
  2 +
  3 +import com.lyms.platform.common.dao.BaseQuery;
  4 +
  5 +public class BabyDiagnoseQuery extends BaseQuery {
  6 + private String startDischargeDate;
  7 + private String endDischargeDate;
  8 + private String startBirthDate;
  9 + private String endBirthDate;
  10 + private String hospitalizationNo;
  11 + private String babyName;
  12 + private String finalDiagnosis;
  13 + //是否建档 1.未建档 2.已建档
  14 + private Integer isbuild;
  15 +
  16 + public Integer getIsbuild() {
  17 + return isbuild;
  18 + }
  19 +
  20 + public void setIsbuild(Integer isbuild) {
  21 + this.isbuild = isbuild;
  22 + }
  23 +
  24 + public String getStartDischargeDate() {
  25 + return startDischargeDate;
  26 + }
  27 +
  28 + public void setStartDischargeDate(String startDischargeDate) {
  29 + this.startDischargeDate = startDischargeDate;
  30 + }
  31 +
  32 + public String getEndDischargeDate() {
  33 + return endDischargeDate;
  34 + }
  35 +
  36 + public void setEndDischargeDate(String endDischargeDate) {
  37 + this.endDischargeDate = endDischargeDate;
  38 + }
  39 +
  40 + public String getStartBirthDate() {
  41 + return startBirthDate;
  42 + }
  43 +
  44 + public void setStartBirthDate(String startBirthDate) {
  45 + this.startBirthDate = startBirthDate;
  46 + }
  47 +
  48 + public String getEndBirthDate() {
  49 + return endBirthDate;
  50 + }
  51 +
  52 + public void setEndBirthDate(String endBirthDate) {
  53 + this.endBirthDate = endBirthDate;
  54 + }
  55 +
  56 + public String getHospitalizationNo() {
  57 + return hospitalizationNo;
  58 + }
  59 +
  60 + public void setHospitalizationNo(String hospitalizationNo) {
  61 + this.hospitalizationNo = hospitalizationNo;
  62 + }
  63 +
  64 + public String getBabyName() {
  65 + return babyName;
  66 + }
  67 +
  68 + public void setBabyName(String babyName) {
  69 + this.babyName = babyName;
  70 + }
  71 +
  72 + public String getFinalDiagnosis() {
  73 + return finalDiagnosis;
  74 + }
  75 +
  76 + public void setFinalDiagnosis(String finalDiagnosis) {
  77 + this.finalDiagnosis = finalDiagnosis;
  78 + }
  79 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java View file @ f902b7d
1 1 package com.lyms.platform.permission.service;
2 2  
  3 +import com.lyms.platform.permission.model.BabyDiagnoseQuery;
3 4 import com.lyms.platform.pojo.BabyDiagnoseModel;
4 5  
5 6 import java.util.List;
... ... @@ -14,5 +15,7 @@
14 15 List<BabyDiagnoseModel> queryBabyDiagnoses(Map param);
15 16  
16 17 void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel);
  18 +
  19 + List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query);
17 20 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java View file @ f902b7d
1 1 package com.lyms.platform.permission.service.impl;
2 2  
3 3 import com.lyms.platform.permission.dao.master.BabyDiagnoseMapper;
  4 +import com.lyms.platform.permission.model.BabyDiagnoseQuery;
4 5 import com.lyms.platform.permission.service.BabyDiagnoseService;
5 6 import com.lyms.platform.pojo.BabyDiagnoseModel;
6 7 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -32,5 +33,12 @@
32 33 public void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel) {
33 34 babyDiagnoseMapper.updateBabyDiagnose(diagnoseModel);
34 35 }
  36 +
  37 + @Override
  38 + public List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query) {
  39 + return babyDiagnoseMapper.queryBabyDiagnosesList(query);
  40 + }
  41 +
  42 +
35 43 }
platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml View file @ f902b7d
... ... @@ -3,36 +3,33 @@
3 3 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4 4 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5 5 <mapper namespace="com.lyms.platform.permission.dao.master.BabyDiagnoseMapper">
  6 +
6 7 <resultMap id="babyDiagnoseResultMap" type="com.lyms.platform.pojo.BabyDiagnoseModel">
7   - <id column="blh" property="blh" jdbcType="VARCHAR"/>
8   - <result column="syxh" property="syxh" jdbcType="VARCHAR"/>
9   - <result column="hzxm" property="hzxm" jdbcType="VARCHAR"/>
10   - <result column="sex" property="sex" jdbcType="VARCHAR"/>
11   - <result column="birth" property="birth" jdbcType="TIMESTAMP"/>
12   - <result column="birthtime" property="birthtime" jdbcType="VARCHAR"/>
13   - <result column="cyzddm" property="cyzddm" jdbcType="VARCHAR"/>
14   - <result column="cyzdmc" property="cyzdmc" jdbcType="VARCHAR"/>
  8 + <result column="blh" property="blh"/>
  9 + <result column="syxh" property="syxh"/>
  10 + <result column="hzxm" property="hzxm"/>
  11 + <result column="sex" property="sex"/>
  12 + <result column="birth" property="birth"/>
  13 + <result column="birthtime" property="birthtime"/>
  14 + <result column="cyzddm" property="cyzddm"/>
  15 + <result column="cyzdmc" property="cyzdmc"/>
  16 + <result column="sfzh" property="sfzh"/>
  17 + <result column="lxdh" property="lxdh"/>
  18 + <result column="lxdz" property="lxdz"/>
  19 + <result column="lxr" property="lxr"/>
  20 + <result column="lxrdh" property="lxrdh"/>
  21 + <result column="curraddr" property="curraddr"/>
  22 + <result column="cyrq" property="cyrq"/>
  23 + <result column="lrrq" property="lrrq"/>
  24 + <result column="rqrq" property="rqrq"/>
  25 + <result column="ryrq" property="ryrq"/>
  26 + <result column="cqrq" property="cqrq"/>
  27 + <result column="ksdm" property="ksdm"/>
  28 + <result column="bqdm" property="bqdm"/>
  29 + <result column="mblh" property="mblh"/>
  30 + <result column="msyxh" property="msyxh"/>
15 31  
16   - <result column="sfzh" property="sfzh" jdbcType="VARCHAR"/>
17   - <result column="lxdh" property="lxdh" jdbcType="VARCHAR"/>
18   - <result column="lxdz" property="lxdz" jdbcType="VARCHAR"/>
19   - <result column="lxr" property="lxr" jdbcType="VARCHAR"/>
20   - <result column="lxrdh" property="lxrdh" jdbcType="VARCHAR"/>
21   -
22   -
23   - <result column="curraddr" property="curraddr" jdbcType="VARCHAR"/>
24   - <result column="cyrq" property="cyrq" jdbcType="TIMESTAMP"/>
25   - <result column="lrrq" property="lrrq" jdbcType="TIMESTAMP"/>
26   - <result column="rqrq" property="rqrq" jdbcType="TIMESTAMP"/>
27   - <result column="ryrq" property="ryrq" jdbcType="TIMESTAMP"/>
28   -
29   - <result column="cqrq" property="cqrq" jdbcType="TIMESTAMP"/>
30   - <result column="ksdm" property="ksdm" jdbcType="VARCHAR"/>
31   - <result column="bqdm" property="bqdm" jdbcType="VARCHAR"/>
32   - <result column="mblh" property="mblh" jdbcType="VARCHAR"/>
33   - <result column="msyxh" property="msyxh" jdbcType="VARCHAR"/>
34   -
35   - <result column="isbuild" property="isbuild" jdbcType="INTEGER"/>
  32 + <result column="isbuild" property="isbuild"/>
36 33 </resultMap>
37 34  
38 35  
39 36  
40 37  
41 38  
42 39  
... ... @@ -91,17 +88,60 @@
91 88  
92 89 </update>
93 90  
  91 + <sql id="babyDiagnosesCondition">
  92 + <where>
  93 + 1=1
  94 + <if test="startDischargeDate != null">
  95 + AND
  96 + <![CDATA[
  97 + DATEDIFF(#{startDischargeDate},cyrq)<=0
  98 + ]]>
  99 + </if>
  100 + <if test="endDischargeDate != null">
  101 + AND
  102 + <![CDATA[
  103 + DATEDIFF(#{endDischargeDate},cyrq)>=0
  104 + ]]>
  105 + </if>
  106 + <if test="startBirthDate != null">
  107 + AND
  108 + <![CDATA[
  109 + DATEDIFF(#{startBirthDate},birth)>=0
  110 + ]]>
  111 + </if>
  112 + <if test="endBirthDate != null">
  113 + AND
  114 + <![CDATA[
  115 + DATEDIFF(#{endBirthDate},birth)>=0
  116 + ]]>
  117 + </if>
  118 + <if test="hospitalizationNo != null">
  119 + and blh = #{hospitalizationNo}
  120 + </if>
  121 + <if test="babyName != null">
  122 + and hzxm =#{babyName}
  123 + </if>
  124 + <if test="finalDiagnosis != null">
  125 + and cyzddm like '#{finalDiagnosis}%'
  126 + </if>
  127 + <if test="isbuild != null">
  128 + and isbuild = #{isbuild}
  129 + </if>
  130 + </where>
  131 + </sql>
94 132  
95   - <!--<select id="queryBabyDiagnosesList" resultType="babyDiagnoseResultMap" parameterType="com.lyms.platform.permission.model.BabyDiagnoseQuery">
  133 +
  134 + <select id="queryBabyDiagnosesList" parameterType="com.lyms.platform.permission.model.BabyDiagnoseQuery"
  135 + resultMap="babyDiagnoseResultMap">
96 136 SELECT
97   - id,blh,syxh,hzxm,py,wb,birth,
  137 + id,blh,syxh,hzxm,birth,
98 138 birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,
99 139 curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,
100 140 cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild
101 141 FROM lyms_baby_diagnose
102   - WHERE 1=1
  142 + <include refid="babyDiagnosesCondition"/>
103 143 <include refid="orderAndLimit"/>
104   - </select>-->
  144 + </select>
105 145  
106 146 </mapper>
platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml View file @ f902b7d
... ... @@ -292,19 +292,19 @@
292 292 and deviceCon = #{deviceCon,jdbcType=INTEGER}
293 293 </if>
294 294 <if test="doctorWeek != null and doctorWeek >= 0">
295   - and doctorWeek = #{doctorWeek,jdbcType=INTEGER}
  295 + and doctorWeek = #{doctorWeek,jdbcType=INTEGER}
296 296 </if>
297 297 <if test="serviceWeek != null and serviceWeek >= 0">
298   - and serviceWeek = #{serviceWeek,jdbcType=INTEGER}
  298 + and serviceWeek = #{serviceWeek,jdbcType=INTEGER}
299 299 </if>
300 300 <if test="serStartWeek != null and serStartWeek >= 0">
301   - and serStartWeek = #{serStartWeek,jdbcType=INTEGER}
  301 + and serStartWeek = #{serStartWeek,jdbcType=INTEGER}
302 302 </if>
303 303 <if test="serEndWeek != null and serEndWeek >= 0">
304   - and serEndWeek = #{serEndWeek,jdbcType=INTEGER}
  304 + and serEndWeek = #{serEndWeek,jdbcType=INTEGER}
305 305 </if>
306 306 <if test="docStartWeek != null and docStartWeek >= 0">
307   - and docStartWeek = #{docStartWeek,jdbcType=INTEGER}
  307 + and docStartWeek = #{docStartWeek,jdbcType=INTEGER}
308 308 </if>
309 309 <if test="docEndWeek != null and docEndWeek >= 0">
310 310 and docEndWeek = #{docEndWeek,jdbcType=INTEGER}
... ... @@ -350,8 +350,9 @@
350 350 </select>
351 351  
352 352 <!--查询只开通了标准服务的数据 -->
353   - <select id="selectOnlyBzService" resultType="java.util.HashMap" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
354   - SELECT * from (SELECT parentid,id,ser_type,create_date from patient_service where ser_status=1
  353 + <select id="selectOnlyBzService" resultType="java.util.HashMap"
  354 + parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
  355 + SELECT * from (SELECT parentid,id,ser_type,create_date from patient_service where ser_status=1
355 356 <if test="perType != null and perType != ''">
356 357 and per_type = #{perType,jdbcType=INTEGER}
357 358 </if>
358 359  
359 360  
... ... @@ -360,18 +361,19 @@
360 361  
361 362 GROUP BY parentid HAVING count(parentid)=1 )as b
362 363 <if test="perType == 1">
363   - where b.ser_type=6
  364 + where b.ser_type=6
364 365 </if>
365 366 <if test="perType == 2">
366   - where b.ser_type=11
  367 + where b.ser_type=11
367 368 </if>
368 369 <include refid="orderAndLimit"/>
369 370 </select>
370 371  
371 372  
372 373 <!--查询只开通了标准服务的数据 -->
373   - <select id="selectOnlyBzServiceCount" resultType="int" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
374   - SELECT count(1) from ( SELECT count(1) from (SELECT parentid,id,ser_type from patient_service where ser_status=1
  374 + <select id="selectOnlyBzServiceCount" resultType="int"
  375 + parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
  376 + SELECT count(1) from ( SELECT count(1) from (SELECT parentid,id,ser_type from patient_service where ser_status=1
375 377 <if test="perType != null and perType != ''">
376 378 and per_type = #{perType,jdbcType=INTEGER}
377 379 </if>
... ... @@ -383,7 +385,7 @@
383 385 where b.ser_type=6
384 386 </if>
385 387 <if test="perType == 2">
386   - where b.ser_type=11
  388 + where b.ser_type=11
387 389 </if>
388 390 ) as c
389 391 </select>
... ... @@ -415,45 +417,45 @@
415 417 </select>
416 418 <select id="getServiceList" resultType="java.util.Map">
417 419 SELECT
418   - o.name as "name",
419   - o.province_id as "provinceId",
420   - o.city_id as "cityId",
421   - o.area_id as "areaId",
422   - o.id as "hospitalId"
423   - FROM patient_service ps
424   - JOIN organization o
425   - ON o.id = ps.hospital_id
426   - WHERE ps.hospital_id = #{id}
427   - <if test="query.startTime != null ">
428   - AND ps.create_date &gt;= #{query.startTime}
429   - </if>
430   - <if test="query.endTime != null ">
431   - AND ps.create_date &lt;= #{query.endTime}
432   - </if>
433   - <if test="query.serType != null and query.serType != '' ">
434   - AND ps.ser_type = #{query.serType}
435   - </if>
436   - <if test="query.createUser != null and query.createUser != '' ">
437   - AND ps.create_user = #{query.createUser}
438   - </if>
439   - <if test="query.operator != null and query.operator != '' ">
440   - AND ps.update_user = #{query.operator}
441   - </if>
442   - <if test="query.serDoct != null and query.serDoct != '' ">
443   - AND ps.ser_doct = #{query.serDoct}
444   - </if>
445   - <if test="query.provinceId != null and query.provinceId != '' ">
446   - and o.province_id = #{query.provinceId}
447   - </if>
448   - <if test="query.cityId != null and query.cityId != ''">
449   - and o.city_id = #{query.cityId}
450   - </if>
451   - <if test="query.areaId != null and query.areaId != ''">
452   - and o.area_id = #{query.areaId}
453   - </if>
454   - GROUP BY o.name,o.province_id,
455   - o.city_id,
456   - o.area_id
  420 + o.name as "name",
  421 + o.province_id as "provinceId",
  422 + o.city_id as "cityId",
  423 + o.area_id as "areaId",
  424 + o.id as "hospitalId"
  425 + FROM patient_service ps
  426 + JOIN organization o
  427 + ON o.id = ps.hospital_id
  428 + WHERE ps.hospital_id = #{id}
  429 + <if test="query.startTime != null ">
  430 + AND ps.create_date &gt;= #{query.startTime}
  431 + </if>
  432 + <if test="query.endTime != null ">
  433 + AND ps.create_date &lt;= #{query.endTime}
  434 + </if>
  435 + <if test="query.serType != null and query.serType != '' ">
  436 + AND ps.ser_type = #{query.serType}
  437 + </if>
  438 + <if test="query.createUser != null and query.createUser != '' ">
  439 + AND ps.create_user = #{query.createUser}
  440 + </if>
  441 + <if test="query.operator != null and query.operator != '' ">
  442 + AND ps.update_user = #{query.operator}
  443 + </if>
  444 + <if test="query.serDoct != null and query.serDoct != '' ">
  445 + AND ps.ser_doct = #{query.serDoct}
  446 + </if>
  447 + <if test="query.provinceId != null and query.provinceId != '' ">
  448 + and o.province_id = #{query.provinceId}
  449 + </if>
  450 + <if test="query.cityId != null and query.cityId != ''">
  451 + and o.city_id = #{query.cityId}
  452 + </if>
  453 + <if test="query.areaId != null and query.areaId != ''">
  454 + and o.area_id = #{query.areaId}
  455 + </if>
  456 + GROUP BY o.name,o.province_id,
  457 + o.city_id,
  458 + o.area_id
457 459 </select>
458 460 <select id="countStatusInfo" resultType="int">
459 461 select count(1)
460 462  
461 463  
462 464  
463 465  
464 466  
465 467  
... ... @@ -491,28 +493,29 @@
491 493 AND ps.ser_doct = #{param.serDoct}
492 494 </if>
493 495 </select>
494   - <select id="getServeDetailList" parameterType="com.lyms.platform.permission.model.ServiceListQuery" resultType="java.util.Map">
  496 + <select id="getServeDetailList" parameterType="com.lyms.platform.permission.model.ServiceListQuery"
  497 + resultType="java.util.Map">
495 498 SELECT
496   - ps.create_date as "createDate",
497   - ps.parentid as "parentId",
498   - ps.per_type as "perType", -- 1-孕妇、2-儿童
499   - IFNULL(ps.serviceWeek, 24) as "serviceWeek",
500   - ps.ser_type as "serType",
501   - ps.ser_doct as "serDoct",
502   - ps.create_user as "createUser",
503   - ps.update_user as "updateUser",
504   - CASE ps.ser_status
  499 + ps.create_date as "createDate",
  500 + ps.parentid as "parentId",
  501 + ps.per_type as "perType", -- 1-孕妇、2-儿童
  502 + IFNULL(ps.serviceWeek, 24) as "serviceWeek",
  503 + ps.ser_type as "serType",
  504 + ps.ser_doct as "serDoct",
  505 + ps.create_user as "createUser",
  506 + ps.update_user as "updateUser",
  507 + CASE ps.ser_status
505 508 WHEN 1 THEN
506   - '开通中'
  509 + '开通中'
507 510 WHEN 2 THEN
508   - '退订'
  511 + '退订'
509 512 WHEN 3 THEN
510   - '过期'
  513 + '过期'
511 514 WHEN 4 THEN
512   - '暂停'
  515 + '暂停'
513 516 END AS "serStatus"
514 517 FROM
515   - patient_service ps
  518 + patient_service ps
516 519 JOIN organization o ON o.id = ps.hospital_id
517 520 WHERE 1=1
518 521 <if test="param.startTime != null">
519 522  
520 523  
... ... @@ -548,16 +551,17 @@
548 551 <if test="param.serDoct != null and param.serDoct != '' ">
549 552 AND ps.ser_doct = #{param.serDoct}
550 553 </if>
551   - order by ps.create_date desc
  554 + order by ps.create_date desc
552 555 <if test="param.need != null">
553 556 limit #{param.offset, jdbcType=INTEGER} , #{param.limit, jdbcType=INTEGER}
554 557 </if>
555 558 </select>
556   - <select id="getServeDetailListCount" parameterType="com.lyms.platform.permission.model.ServiceListQuery" resultType="int">
557   - SELECT
  559 + <select id="getServeDetailListCount" parameterType="com.lyms.platform.permission.model.ServiceListQuery"
  560 + resultType="int">
  561 + SELECT
558 562 count(1)
559 563 FROM
560   - patient_service ps
  564 + patient_service ps
561 565 JOIN organization o ON o.id = ps.hospital_id
562 566 WHERE 1=1
563 567 <if test="param.hospitalId != null and param.hospitalId != ''">
564 568  
565 569  
566 570  
... ... @@ -587,34 +591,34 @@
587 591 <if test="param.serDoct != null and param.serDoct != '' ">
588 592 AND ps.ser_doct = #{param.serDoct}
589 593 </if>
590   - and ps.create_date &gt;= #{param.startTime}
591   - AND ps.create_date &lt;= #{param.endTime}
  594 + and ps.create_date &gt;= #{param.startTime}
  595 + AND ps.create_date &lt;= #{param.endTime}
592 596 </select>
593 597 <select id="getHospitalIds" resultType="string">
594 598 select
595   - o.id as "hospitalId"
  599 + o.id as "hospitalId"
596 600 from organization o
597 601 join (select ps.hospital_id from patient_service ps
598   - where ps.create_date &gt;= #{param.startTime} and ps.create_date &lt;= #{param.endTime}
599   - <if test="param.serType != null and param.serType != ''">and ps.ser_type = #{param.serType}</if>
600   - <if test="param.createUser != null and param.createUser != ''">and ps.create_user = #{param.createUser}</if>
601   - <if test="param.operator != null and param.operator != ''">and ps.update_user = #{param.operator}</if>
602   - <if test="param.serDoct != null and param.serDoct != ''">and ps.ser_doct = #{param.serDoct}</if>
603   - group by ps.hospital_id)
604   - t on t.hospital_id = o.id
  602 + where ps.create_date &gt;= #{param.startTime} and ps.create_date &lt;= #{param.endTime}
  603 + <if test="param.serType != null and param.serType != ''">and ps.ser_type = #{param.serType}</if>
  604 + <if test="param.createUser != null and param.createUser != ''">and ps.create_user = #{param.createUser}</if>
  605 + <if test="param.operator != null and param.operator != ''">and ps.update_user = #{param.operator}</if>
  606 + <if test="param.serDoct != null and param.serDoct != ''">and ps.ser_doct = #{param.serDoct}</if>
  607 + group by ps.hospital_id)
  608 + t on t.hospital_id = o.id
605 609 where t.hospital_id in
606 610 <foreach collection="ids" item="item" open="(" close=")" separator=",">
607 611 #{item}
608 612 </foreach>
609   - <if test="param.provinceId != null and param.provinceId != ''">
610   - and o.province_id = #{param.provinceId}
611   - </if>
612   - <if test="param.cityId != null and param.cityId != ''">
613   - and o.city_id = #{param.cityId}
614   - </if>
615   - <if test="param.areaId != null and param.areaId != ''">
616   - and o.area_id = #{param.areaId}
617   - </if>
  613 + <if test="param.provinceId != null and param.provinceId != ''">
  614 + and o.province_id = #{param.provinceId}
  615 + </if>
  616 + <if test="param.cityId != null and param.cityId != ''">
  617 + and o.city_id = #{param.cityId}
  618 + </if>
  619 + <if test="param.areaId != null and param.areaId != ''">
  620 + and o.area_id = #{param.areaId}
  621 + </if>
618 622  
619 623 </select>
620 624 <select id="getServiceListByParentId" resultType="com.lyms.platform.permission.model.PatientService">
platform-dal/src/main/java/com/lyms/platform/pojo/BabyDiagnoseModel.java View file @ f902b7d
... ... @@ -7,13 +7,13 @@
7 7 */
8 8 public class BabyDiagnoseModel {
9 9  
  10 + private Integer id;
10 11 //病历号=住院号
11 12 private String blh;
12 13  
13 14 private String syxh;
14 15  
15 16  
16   -
17 17 //姓名
18 18 private String hzxm;
19 19  
... ... @@ -43,7 +43,7 @@
43 43 private String lxr;
44 44  
45 45 //联系人电话
46   - private String lxrdh;
  46 + private String lxrdh;
47 47  
48 48 //当前地址
49 49 private String curraddr;
... ... @@ -66,6 +66,14 @@
66 66  
67 67 //是否建档 1未建档 2已建档
68 68 private Integer isbuild;
  69 +
  70 + public Integer getId() {
  71 + return id;
  72 + }
  73 +
  74 + public void setId(Integer id) {
  75 + this.id = id;
  76 + }
69 77  
70 78 public Integer getIsbuild() {
71 79 return isbuild;
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ f902b7d
... ... @@ -16,8 +16,11 @@
16 16 import com.lyms.platform.common.utils.ExceptionUtils;
17 17 import com.lyms.platform.common.utils.JsonUtil;
18 18 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
  19 +import com.lyms.platform.operate.web.request.BasePageQueryRequest;
  20 +import com.lyms.platform.permission.model.BabyDiagnoseQuery;
19 21 import com.lyms.platform.permission.model.LisReportItemModel;
20 22 import com.lyms.platform.permission.model.LisReportModel;
  23 +import com.lyms.platform.permission.service.BabyDiagnoseService;
21 24 import com.lyms.platform.pojo.*;
22 25 import com.lyms.platform.query.LisReportQuery;
23 26 import com.lyms.platform.query.PatientsQuery;
... ... @@ -65,6 +68,8 @@
65 68 @Autowired
66 69 private AntenatalExaminationFacade antenatalExaminationFacade;
67 70  
  71 + @Autowired
  72 + private BabyDiagnoseService babyDiagnoseService;
68 73  
69 74 public void syncLisReportTimer() {
70 75 Date date = new Date();
... ... @@ -841,7 +846,7 @@
841 846 //List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '" + blNo + "'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
842 847 List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
843 848 if (CollectionUtils.isNotEmpty(list)) {
844   - for (DiagnosisInfo info:list) {
  849 + for (DiagnosisInfo info : list) {
845 850 map.put("diagnosisItem", info.getDiagnosisItem());
846 851 break;
847 852 }
848 853  
... ... @@ -993,15 +998,14 @@
993 998  
994 999 List<BabyDischargeDiagnosisModel> list = queryRunner.query(conn, sql, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
995 1000 return list;
996   - }
997   - catch (Exception e)
998   - {
999   - ExceptionUtils.catchException(e,"queryNewBabyDiagnose error. sql:"+sql);
1000   - }
1001   - finally {
  1001 + } catch (Exception e) {
  1002 + ExceptionUtils.catchException(e, "queryNewBabyDiagnose error. sql:" + sql);
  1003 + } finally {
1002 1004 DbUtils.closeQuietly(conn);
1003 1005 }
1004 1006 return null;
1005 1007 }
  1008 +
  1009 +
1006 1010 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ f902b7d
... ... @@ -13,13 +13,11 @@
13 13 import com.lyms.platform.common.utils.StringUtils;
14 14 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
15 15 import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
16   -import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
17   -import com.lyms.platform.operate.web.request.BabyGuideSmsequest;
18   -import com.lyms.platform.operate.web.request.BabyManageRequest;
19   -import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
  16 +import com.lyms.platform.operate.web.request.*;
20 17 import com.lyms.platform.operate.web.result.QueryHospitalListRequest;
21 18 import com.lyms.platform.operate.web.result.QueryHospitalListResult;
22 19 import com.lyms.platform.operate.web.utils.CollectionUtils;
  20 +import com.lyms.platform.permission.model.BabyDiagnoseQuery;
23 21 import com.lyms.platform.permission.service.CouponService;
24 22 import org.apache.log4j.Logger;
25 23 import org.springframework.beans.factory.annotation.Autowired;
26 24  
27 25  
... ... @@ -552,23 +550,16 @@
552 550 @ResponseBody
553 551 @RequestMapping(value = "/getBabyLeaveHospitalDiacrisis", method = RequestMethod.GET)
554 552 @TokenRequired
555   - public BaseResponse getBabyLeaveHospitaiacrisis(HttpServletRequest request, HttpServletResponse response,
556   - @RequestParam(value = "startDischargeDate", required = false) String startDischargeDate,
557   - @RequestParam(value = "endDischargeDate", required = false) String endDischargeDate,
558   - @RequestParam(value = "startBirthDate", required = false) String startBirthDate,
559   - @RequestParam(value = "endBirthDate", required = false) String endBirthDate,
560   - @RequestParam(value = "hospitalizationNo", required = false) String hospitalizationNo,
561   - @RequestParam(value = "babyName", required = false) String babyName,
562   - @RequestParam(value = "finalDiagnosis", required = false) String finalDiagnosis,
  553 + public BaseResponse getBabyLeaveHospitaiacrisis(BabyDiagnoseQuery babyDiagnoseQuery,
563 554 @RequestParam("page") Integer page,
564 555 @RequestParam("limit") Integer limit) {
565   -
566   - return babyBookbuildingFacade.getBabyDiacrisis(startDischargeDate, endDischargeDate, startBirthDate, endBirthDate, hospitalizationNo, babyName, finalDiagnosis, page, limit);
  556 + return babyBookbuildingFacade.getBabyDiacrisisList(babyDiagnoseQuery, page, limit);
567 557 }
568 558  
569 559  
570 560 /**
571 561 * 处理历史数据 按照时间返回获取保存，格式：lrrqStart=2019062414:41:00&lrrqEnd=2019062418:41:00
  562 + *
572 563 * @param lrrqStart
573 564 * @param lrrqEnd
574 565 * @return
575 566  
... ... @@ -576,12 +567,11 @@
576 567 @ResponseBody
577 568 @RequestMapping(value = "/queryNewBabyDiagnose", method = RequestMethod.GET)
578 569 public BaseResponse queryNewBabyDiagnose(HttpServletRequest request, HttpServletResponse response,
579   - @RequestParam(value = "lrrqStart", required = true) String lrrqStart,
580   - @RequestParam(value = "lrrqEnd", required = true) String lrrqEnd
581   - ) {
582   - return babyBookbuildingFacade.queryNewBabyDiagnose(lrrqStart,lrrqEnd);
  570 + @RequestParam(value = "lrrqStart", required = true) String lrrqStart,
  571 + @RequestParam(value = "lrrqEnd", required = true) String lrrqEnd
  572 + ) {
  573 + return babyBookbuildingFacade.queryNewBabyDiagnose(lrrqStart, lrrqEnd);
583 574 }
584   -
585 575  
586 576  
587 577 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ f902b7d
... ... @@ -32,7 +32,6 @@
32 32 import com.lyms.platform.pojo.*;
33 33 import com.lyms.platform.query.*;
34 34 import org.apache.commons.collections.CollectionUtils;
35   -import org.apache.commons.lang.math.NumberUtils;
36 35 import org.springframework.beans.factory.annotation.Autowired;
37 36 import org.springframework.beans.factory.annotation.Qualifier;
38 37 import org.springframework.data.domain.Sort;
... ... @@ -45,7 +44,6 @@
45 44 import javax.servlet.http.HttpServletResponse;
46 45 import java.io.IOException;
47 46 import java.io.OutputStream;
48   -import java.text.SimpleDateFormat;
49 47 import java.util.*;
50 48 import java.util.concurrent.Callable;
51 49 import java.util.concurrent.Future;
... ... @@ -781,7 +779,7 @@
781 779 }
782 780 //创建建档短信
783 781 createBuildMsg(model);
784   - handleBabyDiangose(request.getBlNo(),hid);
  782 + handleBabyDiangose(request.getBlNo(), hid);
785 783  
786 784 br.setErrorcode(ErrorCodeConstants.SUCCESS);
787 785 br.setErrormsg("成功");
... ... @@ -796,10 +794,8 @@
796 794 /**
797 795 * 秦皇岛妇幼儿童建档后根据住院号 更新诊断记录为已经建档状态
798 796 */
799   - private void handleBabyDiangose(String blh,String hospitalId)
800   - {
801   - if ("216".equals(hospitalId) && StringUtils.isNotEmpty(blh))
802   - {
  797 + private void handleBabyDiangose(String blh, String hospitalId) {
  798 + if ("216".equals(hospitalId) && StringUtils.isNotEmpty(blh)) {
803 799 BabyDiagnoseModel model = new BabyDiagnoseModel();
804 800 model.setIsbuild(2);
805 801 model.setBlh(blh);
... ... @@ -809,7 +805,6 @@
809 805 }
810 806  
811 807  
812   -
813 808 /**
814 809 * 添加或更新追访信息
815 810 *
816 811  
817 812  
... ... @@ -4050,10 +4045,53 @@
4050 4045 }
4051 4046  
4052 4047  
  4048 + public BaseListResponse getBabyDiacrisisList(BabyDiagnoseQuery babyDiagnoseQuery, Integer page, Integer limit) {
  4049 + List<Map<String, Object>> result = new ArrayList<>();
  4050 +
  4051 + babyDiagnoseQuery.setLimit(limit);
  4052 + babyDiagnoseQuery.setPage(page);
  4053 + if (StringUtils.isNotEmpty(babyDiagnoseQuery.getStartDischargeDate()) && StringUtils.isNotEmpty(babyDiagnoseQuery.getEndDischargeDate())) {
  4054 + babyDiagnoseQuery.setStartDischargeDate(babyDiagnoseQuery.getStartDischargeDate() + " 00:00:00");
  4055 + babyDiagnoseQuery.setEndDischargeDate(babyDiagnoseQuery.getEndDischargeDate() + " 23:59:59");
  4056 + }
  4057 + if (StringUtils.isNotEmpty(babyDiagnoseQuery.getStartBirthDate()) && StringUtils.isNotEmpty(babyDiagnoseQuery.getEndBirthDate())) {
  4058 + babyDiagnoseQuery.setStartBirthDate(babyDiagnoseQuery.getStartBirthDate() + " 00:00:00");
  4059 + babyDiagnoseQuery.setEndBirthDate(babyDiagnoseQuery.getEndBirthDate() + " 23:59:59");
  4060 + }
  4061 +
  4062 + List<BabyDiagnoseModel> babyDiagnoseModels = babyDiagnoseService.queryBabyDiagnosesList(babyDiagnoseQuery);
  4063 + if (babyDiagnoseModels.size() > 0) {
  4064 + for (BabyDiagnoseModel info : babyDiagnoseModels) {
  4065 + Map<String, Object> map = new HashMap<>();
  4066 + if (null != info.getCyrq()) {
  4067 + map.put("dischargeDate", DateUtil.getyyyy_MM_dd(info.getCyrq()));
  4068 + if (null != info.getBirth()) {
  4069 + map.put("birth", DateUtil.getyyyy_MM_dd(info.getBirth()));
  4070 + map.put("monthAge", DateUtil.getBabyMonthAge(info.getBirth(), new Date()));
  4071 + }
  4072 + map.put("babyName", info.getHzxm());
  4073 + map.put("sex", info.getSex());
  4074 + map.put("hospitalizationNo", info.getBlh());
  4075 + map.put("dischargeDiagnosis", info.getCyzdmc());
  4076 + result.add(map);
  4077 + }
  4078 + }
  4079 + }
  4080 + babyDiagnoseQuery.setCount(babyDiagnoseModels.size());
  4081 + BaseListResponse objectResponse = new BaseListResponse();
  4082 + objectResponse.setPageInfo(babyDiagnoseQuery.getPageInfo());
  4083 + objectResponse.setData(result);
  4084 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  4085 + objectResponse.setErrormsg("成功");
  4086 + return objectResponse;
  4087 + }
  4088 +
  4089 +
4053 4090 /**
4054 4091 * 查询一段时间新生儿诊断记录
  4092 + *
4055 4093 * @param lrrqStart 录入日期开始
4056   - * @param lrrqEnd 录入日期结束
  4094 + * @param lrrqEnd 录入日期结束
4057 4095 */
4058 4096 public BaseObjectResponse queryNewBabyDiagnose(String lrrqStart, String lrrqEnd) {
4059 4097  
4060 4098  
4061 4099  
4062 4100  
4063 4101  
4064 4102  
4065 4103  
... ... @@ -4065,32 +4103,27 @@
4065 4103  
4066 4104 /**
4067 4105 * 处理数据
  4106 + *
4068 4107 * @param lrrqStart
4069 4108 * @param lrrqEnd
4070 4109 * @return
4071 4110 */
4072   - public int handleBabyDiagnose(String lrrqStart, String lrrqEnd)
4073   - {
  4111 + public int handleBabyDiagnose(String lrrqStart, String lrrqEnd) {
4074 4112 List<BabyDischargeDiagnosisModel> list = qhdfyHisService.queryNewBabyDiagnose(lrrqStart, lrrqEnd);
4075 4113  
4076   - if (CollectionUtils.isNotEmpty(list))
4077   - {
  4114 + if (CollectionUtils.isNotEmpty(list)) {
4078 4115 Map param = new HashMap();
4079   - for (BabyDischargeDiagnosisModel model : list)
4080   - {
4081   - param.put("blh",model.getBlh());
  4116 + for (BabyDischargeDiagnosisModel model : list) {
  4117 + param.put("blh", model.getBlh());
4082 4118  
4083 4119 try {
4084 4120 List<BabyDiagnoseModel> dbList = babyDiagnoseService.queryBabyDiagnoses(param);
4085   - if (CollectionUtils.isEmpty(dbList))
4086   - {
  4121 + if (CollectionUtils.isEmpty(dbList)) {
4087 4122 BabyDiagnoseModel babyDiagnoseModel = model.convertToDataModel();
4088 4123 babyDiagnoseService.addBabyDiagnose(babyDiagnoseModel);
4089   - System.out.println("handleBabyDiagnose success "+ model.getBlh());
  4124 + System.out.println("handleBabyDiagnose success " + model.getBlh());
4090 4125 }
4091   - }
4092   - catch (Exception e)
4093   - {
  4126 + } catch (Exception e) {
4094 4127 ExceptionUtils.catchException(e, "handleBabyDiagnose error.");
4095 4128 continue;
4096 4129 }
... ... @@ -4115,7 +4148,6 @@
4115 4148 int size = handleBabyDiagnose(lrrqStart, lrrqEnd);
4116 4149 System.out.println("autoGetBabyDiagnose size " + size);
4117 4150 }
4118   -
4119 4151  
4120 4152  
4121 4153 }