From f902b7d6bfe454a2e239f60c6e79e92b762d888f Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 25 Jun 2019 16:29:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E8=AF=8A=E6=96=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/BabyDiagnoseMapper.java | 5 + .../permission/model/BabyDiagnoseQuery.java | 79 +++++++++ .../permission/service/BabyDiagnoseService.java | 3 + .../permission/service/impl/BabyDiagnoseImpl.java | 8 + .../mainOrm/master/BabyDiagnoseMapper.xml | 104 ++++++++---- .../resources/mainOrm/master/PatientService.xml | 182 +++++++++++---------- .../com/lyms/platform/pojo/BabyDiagnoseModel.java | 12 +- .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 18 +- .../web/controller/BabyBuildController.java | 28 +--- .../operate/web/facade/BabyBookbuildingFacade.java | 78 ++++++--- 10 files changed, 345 insertions(+), 172 deletions(-) create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyDiagnoseQuery.java diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java index 54b1317..b6d0ef2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java @@ -1,5 +1,6 @@ package com.lyms.platform.permission.dao.master; +import com.lyms.platform.permission.model.BabyDiagnoseQuery; import com.lyms.platform.pojo.BabyDiagnoseModel; import java.util.List; @@ -14,4 +15,8 @@ public interface BabyDiagnoseMapper { List queryBabyDiagnoses(Map param); void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel); + + List queryBabyDiagnosesList(BabyDiagnoseQuery query); + + } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyDiagnoseQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyDiagnoseQuery.java new file mode 100644 index 0000000..a9c2d87 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyDiagnoseQuery.java @@ -0,0 +1,79 @@ +package com.lyms.platform.permission.model; + +import com.lyms.platform.common.dao.BaseQuery; + +public class BabyDiagnoseQuery extends BaseQuery { + private String startDischargeDate; + private String endDischargeDate; + private String startBirthDate; + private String endBirthDate; + private String hospitalizationNo; + private String babyName; + private String finalDiagnosis; + //是否建档 1.未建档 2.已建档 + private Integer isbuild; + + public Integer getIsbuild() { + return isbuild; + } + + public void setIsbuild(Integer isbuild) { + this.isbuild = isbuild; + } + + public String getStartDischargeDate() { + return startDischargeDate; + } + + public void setStartDischargeDate(String startDischargeDate) { + this.startDischargeDate = startDischargeDate; + } + + public String getEndDischargeDate() { + return endDischargeDate; + } + + public void setEndDischargeDate(String endDischargeDate) { + this.endDischargeDate = endDischargeDate; + } + + public String getStartBirthDate() { + return startBirthDate; + } + + public void setStartBirthDate(String startBirthDate) { + this.startBirthDate = startBirthDate; + } + + public String getEndBirthDate() { + return endBirthDate; + } + + public void setEndBirthDate(String endBirthDate) { + this.endBirthDate = endBirthDate; + } + + public String getHospitalizationNo() { + return hospitalizationNo; + } + + public void setHospitalizationNo(String hospitalizationNo) { + this.hospitalizationNo = hospitalizationNo; + } + + public String getBabyName() { + return babyName; + } + + public void setBabyName(String babyName) { + this.babyName = babyName; + } + + public String getFinalDiagnosis() { + return finalDiagnosis; + } + + public void setFinalDiagnosis(String finalDiagnosis) { + this.finalDiagnosis = finalDiagnosis; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java index 3108ee3..e09cad4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java @@ -1,5 +1,6 @@ package com.lyms.platform.permission.service; +import com.lyms.platform.permission.model.BabyDiagnoseQuery; import com.lyms.platform.pojo.BabyDiagnoseModel; import java.util.List; @@ -14,4 +15,6 @@ public interface BabyDiagnoseService { List queryBabyDiagnoses(Map param); void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel); + + List queryBabyDiagnosesList(BabyDiagnoseQuery query); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java index 7d71cbc..2debbc4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.permission.dao.master.BabyDiagnoseMapper; +import com.lyms.platform.permission.model.BabyDiagnoseQuery; import com.lyms.platform.permission.service.BabyDiagnoseService; import com.lyms.platform.pojo.BabyDiagnoseModel; import org.springframework.beans.factory.annotation.Autowired; @@ -32,4 +33,11 @@ public class BabyDiagnoseImpl implements BabyDiagnoseService { public void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel) { babyDiagnoseMapper.updateBabyDiagnose(diagnoseModel); } + + @Override + public List queryBabyDiagnosesList(BabyDiagnoseQuery query) { + return babyDiagnoseMapper.queryBabyDiagnosesList(query); + } + + } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml index a963bb4..622a2f4 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml @@ -3,36 +3,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -91,16 +88,59 @@ + + + 1=1 + + AND + + + + AND + =0 + ]]> + + + AND + =0 + ]]> + + + AND + =0 + ]]> + + + and blh = #{hospitalizationNo} + + + and hzxm =#{babyName} + + + and cyzddm like '#{finalDiagnosis}%' + + + and isbuild = #{isbuild} + + + + - + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml index 177c044..15634f7 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml @@ -292,19 +292,19 @@ and deviceCon = #{deviceCon,jdbcType=INTEGER} - and doctorWeek = #{doctorWeek,jdbcType=INTEGER} + and doctorWeek = #{doctorWeek,jdbcType=INTEGER} - and serviceWeek = #{serviceWeek,jdbcType=INTEGER} + and serviceWeek = #{serviceWeek,jdbcType=INTEGER} - and serStartWeek = #{serStartWeek,jdbcType=INTEGER} + and serStartWeek = #{serStartWeek,jdbcType=INTEGER} - and serEndWeek = #{serEndWeek,jdbcType=INTEGER} + and serEndWeek = #{serEndWeek,jdbcType=INTEGER} - and docStartWeek = #{docStartWeek,jdbcType=INTEGER} + and docStartWeek = #{docStartWeek,jdbcType=INTEGER} and docEndWeek = #{docEndWeek,jdbcType=INTEGER} @@ -350,8 +350,9 @@ - + SELECT * from (SELECT parentid,id,ser_type,create_date from patient_service where ser_status=1 and per_type = #{perType,jdbcType=INTEGER} @@ -360,18 +361,19 @@ GROUP BY parentid HAVING count(parentid)=1 )as b - where b.ser_type=6 + where b.ser_type=6 - where b.ser_type=11 + where b.ser_type=11 - + SELECT count(1) from ( SELECT count(1) from (SELECT parentid,id,ser_type from patient_service where ser_status=1 and per_type = #{perType,jdbcType=INTEGER} @@ -383,7 +385,7 @@ where b.ser_type=6 - where b.ser_type=11 + where b.ser_type=11 ) as c @@ -415,45 +417,45 @@ - SELECT - ps.create_date as "createDate", - ps.parentid as "parentId", - ps.per_type as "perType", -- 1-孕妇、2-儿童 - IFNULL(ps.serviceWeek, 24) as "serviceWeek", - ps.ser_type as "serType", - ps.ser_doct as "serDoct", - ps.create_user as "createUser", - ps.update_user as "updateUser", - CASE ps.ser_status + ps.create_date as "createDate", + ps.parentid as "parentId", + ps.per_type as "perType", -- 1-孕妇、2-儿童 + IFNULL(ps.serviceWeek, 24) as "serviceWeek", + ps.ser_type as "serType", + ps.ser_doct as "serDoct", + ps.create_user as "createUser", + ps.update_user as "updateUser", + CASE ps.ser_status WHEN 1 THEN - '开通中' + '开通中' WHEN 2 THEN - '退订' + '退订' WHEN 3 THEN - '过期' + '过期' WHEN 4 THEN - '暂停' + '暂停' END AS "serStatus" FROM - patient_service ps + patient_service ps JOIN organization o ON o.id = ps.hospital_id WHERE 1=1 @@ -548,16 +551,17 @@ AND ps.ser_doct = #{param.serDoct} - order by ps.create_date desc + order by ps.create_date desc limit #{param.offset, jdbcType=INTEGER} , #{param.limit, jdbcType=INTEGER} - + SELECT count(1) FROM - patient_service ps + patient_service ps JOIN organization o ON o.id = ps.hospital_id WHERE 1=1 @@ -587,34 +591,34 @@ AND ps.ser_doct = #{param.serDoct} - and ps.create_date >= #{param.startTime} - AND ps.create_date <= #{param.endTime} + and ps.create_date >= #{param.startTime} + AND ps.create_date <= #{param.endTime}