jiangjiazhi / regional-platform

Commit 9076902e41305308333aa76711e797aabc27ebb7

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

秦皇岛儿童诊断

Showing 13 changed files with 886 additions and 44 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java
platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyDiagnoseModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/BabyDischargeDiagnosisModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/NewBabyDiagnoseModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java

	1	+package com.lyms.platform.permission.dao.master;
	2	+
	3	+import com.lyms.platform.pojo.BabyDiagnoseModel;
	4	+
	5	+import java.util.List;
	6	+import java.util.Map;
	7	+
	8	+/**
	9	+ * Created by Administrator on 2019-06-24.
	10	+ */
	11	+public interface BabyDiagnoseMapper {
	12	+ void addBabyDiagnose(BabyDiagnoseModel diagnoseModel);
	13	+
	14	+ List<BabyDiagnoseModel> queryBabyDiagnoses(Map param);
	15	+
	16	+ void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel);
	17	+}

	1	+package com.lyms.platform.permission.service;
	2	+
	3	+import com.lyms.platform.pojo.BabyDiagnoseModel;
	4	+
	5	+import java.util.List;
	6	+import java.util.Map;
	7	+
	8	+/**
	9	+ * Created by Administrator on 2018-08-06.
	10	+ */
	11	+public interface BabyDiagnoseService {
	12	+ void addBabyDiagnose(BabyDiagnoseModel diagnoseModel);
	13	+
	14	+ List<BabyDiagnoseModel> queryBabyDiagnoses(Map param);
	15	+
	16	+ void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel);
	17	+}

	1	+package com.lyms.platform.permission.service.impl;
	2	+
	3	+import com.lyms.platform.permission.dao.master.BabyDiagnoseMapper;
	4	+import com.lyms.platform.permission.service.BabyDiagnoseService;
	5	+import com.lyms.platform.pojo.BabyDiagnoseModel;
	6	+import org.springframework.beans.factory.annotation.Autowired;
	7	+import org.springframework.stereotype.Service;
	8	+
	9	+import java.util.List;
	10	+import java.util.Map;
	11	+
	12	+/**
	13	+ * Created by Administrator on 2018-08-06.
	14	+ */
	15	+@Service
	16	+public class BabyDiagnoseImpl implements BabyDiagnoseService {
	17	+
	18	+ @Autowired
	19	+ private BabyDiagnoseMapper babyDiagnoseMapper;
	20	+
	21	+ @Override
	22	+ public void addBabyDiagnose(BabyDiagnoseModel diagnoseModel) {
	23	+ babyDiagnoseMapper.addBabyDiagnose(diagnoseModel);
	24	+ }
	25	+
	26	+ @Override
	27	+ public List<BabyDiagnoseModel> queryBabyDiagnoses(Map param) {
	28	+ return babyDiagnoseMapper.queryBabyDiagnoses(param);
	29	+ }
	30	+
	31	+ @Override
	32	+ public void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel) {
	33	+ babyDiagnoseMapper.updateBabyDiagnose(diagnoseModel);
	34	+ }
	35	+}

	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper
	3	+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	4	+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	5	+<mapper namespace="com.lyms.platform.permission.dao.master.BabyDiagnoseMapper">
	6	+
	7	+ <insert id="addBabyDiagnose" parameterType="com.lyms.platform.pojo.BabyDiagnoseModel" >
	8	+ <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer"> SELECT LAST_INSERT_ID() </selectKey>
	9	+ INSERT INTO lyms_baby_diagnose
	10	+ (blh,syxh,hzxm,birth,
	11	+ birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,
	12	+ curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,
	13	+ cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild)
	14	+ VALUES (#{blh},#{syxh,#{hzxm},#{birth},
	15	+ #{birthtime},#{sex},#{sfzh},#{lxdh},#{lxdz},#{lxr},#{lxrdh},
	16	+ #{curraddr},#{lrrq},#{ryrq},#{rqrq},#{cyrq},#{cqrq},#{cyzddm},
	17	+ #{cyzdmc},#{ksdm},#{bqdm},#{mblh},#{msyxh},#{isbuild})
	18	+ </insert>
	19	+
	20	+
	21	+ <select id="queryBabyDiagnoses" parameterType="java.util.Map" resultType="com.lyms.platform.pojo.BabyDiagnoseModel">
	22	+ SELECT
	23	+ id,blh,syxh,hzxm,py,wb,birth,
	24	+ birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,
	25	+ curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,
	26	+ cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild
	27	+ FROM lyms_baby_diagnose
	28	+ WHERE 1 = 1
	29	+ <if test="id != null">
	30	+ and id = #{id,jdbcType=INTEGER}
	31	+ </if>
	32	+ <if test="blh != null and blh != ''">
	33	+ and blh = #{blh,jdbcType=VARCHAR}
	34	+ </if>
	35	+ <if test="syxh != null and syxh != ''">
	36	+ and syxh = #{syxh,jdbcType=VARCHAR}
	37	+ </if>
	38	+ </select>
	39	+
	40	+
	41	+ <update id="updateBabyDiagnose" parameterType="com.lyms.platform.pojo.BabyDiagnoseModel" >
	42	+ UPDATE
	43	+ lyms_baby_diagnose
	44	+ <set>
	45	+ <if test="isbuild != null">
	46	+ isbuild = #{isbuild,jdbcType=INTEGER},
	47	+ </if>
	48	+ </set>
	49	+ where blh = #{blh,jdbcType=VARCHAR}
	50	+
	51	+ </update>
	52	+
	53	+</mapper>

...	...	@@ -25,6 +25,8 @@
25	25	public static String[] parsePatterns = {"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss",
26	26	"yyyy/MM/dd HH:mm"};
27	27
	28	+ public static SimpleDateFormat yyyyMMddHHmmss = new SimpleDateFormat("yyyyMMddHH:mm:ss");
	29	+
28	30	public static SimpleDateFormat yyyy_mm = new SimpleDateFormat("yyyy-MM");
29	31
30	32	public static SimpleDateFormat y_m_d_h_m = new SimpleDateFormat("yyyyMMddHHmm");
...	...	@@ -611,6 +613,29 @@
611	613	}
612	614	try {
613	615	return y_m_d_h_m_s.format(d);
	616	+ } catch (Exception e) {
	617	+ return null;
	618	+ }
	619	+ }
	620	+
	621	+
	622	+ public static String getYyyyMMddHHssmm(Date d) {
	623	+ if (d == null) {
	624	+ return null;
	625	+ }
	626	+ try {
	627	+ return yyyyMMddHHmmss.format(d);
	628	+ } catch (Exception e) {
	629	+ return null;
	630	+ }
	631	+ }
	632	+
	633	+ public static Date parseYyyyMMddHHssmm(String d) {
	634	+ if (d == null) {
	635	+ return null;
	636	+ }
	637	+ try {
	638	+ return yyyyMMddHHmmss.parse(d);
614	639	} catch (Exception e) {
615	640	return null;
616	641	}

	1	+package com.lyms.platform.pojo;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ * Created by Administrator on 2019-06-24.
	7	+ */
	8	+public class BabyDiagnoseModel {
	9	+
	10	+ //病历号=住院号
	11	+ private String blh;
	12	+
	13	+ private String syxh;
	14	+
	15	+
	16	+
	17	+ //姓名
	18	+ private String hzxm;
	19	+
	20	+ //性别
	21	+ private String sex;
	22	+
	23	+ //出生日期
	24	+ private Date birth;
	25	+ private String birthtime;
	26	+
	27	+ //出院诊断代码
	28	+ private String cyzddm;
	29	+
	30	+ //出院诊断
	31	+ private String cyzdmc;
	32	+
	33	+ //身份证号
	34	+ private String sfzh;
	35	+
	36	+ //联系电话
	37	+ private String lxdh;
	38	+
	39	+ //联系地址
	40	+ private String lxdz;
	41	+
	42	+ //联系人
	43	+ private String lxr;
	44	+
	45	+ //联系人电话
	46	+ private String lxrdh;
	47	+
	48	+ //当前地址
	49	+ private String curraddr;
	50	+
	51	+ //出院日期
	52	+ private Date cyrq;
	53	+
	54	+ //录入日期
	55	+ private Date lrrq;
	56	+ private Date rqrq;
	57	+
	58	+ //入院日期
	59	+ private Date ryrq;
	60	+ private Date cqrq;
	61	+
	62	+ private String ksdm;
	63	+ private String bqdm;
	64	+ private String mblh;
	65	+ private String msyxh;
	66	+
	67	+ //是否建档 1未建档 2已建档
	68	+ private Integer isbuild;
	69	+
	70	+ public Integer getIsbuild() {
	71	+ return isbuild;
	72	+ }
	73	+
	74	+ public void setIsbuild(Integer isbuild) {
	75	+ this.isbuild = isbuild;
	76	+ }
	77	+
	78	+ public String getBlh() {
	79	+ return blh;
	80	+ }
	81	+
	82	+ public void setBlh(String blh) {
	83	+ this.blh = blh;
	84	+ }
	85	+
	86	+ public String getSyxh() {
	87	+ return syxh;
	88	+ }
	89	+
	90	+ public void setSyxh(String syxh) {
	91	+ this.syxh = syxh;
	92	+ }
	93	+
	94	+ public String getHzxm() {
	95	+ return hzxm;
	96	+ }
	97	+
	98	+ public void setHzxm(String hzxm) {
	99	+ this.hzxm = hzxm;
	100	+ }
	101	+
	102	+ public String getSex() {
	103	+ return sex;
	104	+ }
	105	+
	106	+ public void setSex(String sex) {
	107	+ this.sex = sex;
	108	+ }
	109	+
	110	+ public Date getBirth() {
	111	+ return birth;
	112	+ }
	113	+
	114	+ public void setBirth(Date birth) {
	115	+ this.birth = birth;
	116	+ }
	117	+
	118	+ public String getBirthtime() {
	119	+ return birthtime;
	120	+ }
	121	+
	122	+ public void setBirthtime(String birthtime) {
	123	+ this.birthtime = birthtime;
	124	+ }
	125	+
	126	+ public String getCyzddm() {
	127	+ return cyzddm;
	128	+ }
	129	+
	130	+ public void setCyzddm(String cyzddm) {
	131	+ this.cyzddm = cyzddm;
	132	+ }
	133	+
	134	+ public String getCyzdmc() {
	135	+ return cyzdmc;
	136	+ }
	137	+
	138	+ public void setCyzdmc(String cyzdmc) {
	139	+ this.cyzdmc = cyzdmc;
	140	+ }
	141	+
	142	+ public String getSfzh() {
	143	+ return sfzh;
	144	+ }
	145	+
	146	+ public void setSfzh(String sfzh) {
	147	+ this.sfzh = sfzh;
	148	+ }
	149	+
	150	+ public String getLxdh() {
	151	+ return lxdh;
	152	+ }
	153	+
	154	+ public void setLxdh(String lxdh) {
	155	+ this.lxdh = lxdh;
	156	+ }
	157	+
	158	+ public String getLxdz() {
	159	+ return lxdz;
	160	+ }
	161	+
	162	+ public void setLxdz(String lxdz) {
	163	+ this.lxdz = lxdz;
	164	+ }
	165	+
	166	+ public String getLxr() {
	167	+ return lxr;
	168	+ }
	169	+
	170	+ public void setLxr(String lxr) {
	171	+ this.lxr = lxr;
	172	+ }
	173	+
	174	+ public String getLxrdh() {
	175	+ return lxrdh;
	176	+ }
	177	+
	178	+ public void setLxrdh(String lxrdh) {
	179	+ this.lxrdh = lxrdh;
	180	+ }
	181	+
	182	+ public String getCurraddr() {
	183	+ return curraddr;
	184	+ }
	185	+
	186	+ public void setCurraddr(String curraddr) {
	187	+ this.curraddr = curraddr;
	188	+ }
	189	+
	190	+ public Date getCyrq() {
	191	+ return cyrq;
	192	+ }
	193	+
	194	+ public void setCyrq(Date cyrq) {
	195	+ this.cyrq = cyrq;
	196	+ }
	197	+
	198	+ public Date getLrrq() {
	199	+ return lrrq;
	200	+ }
	201	+
	202	+ public void setLrrq(Date lrrq) {
	203	+ this.lrrq = lrrq;
	204	+ }
	205	+
	206	+ public Date getRqrq() {
	207	+ return rqrq;
	208	+ }
	209	+
	210	+ public void setRqrq(Date rqrq) {
	211	+ this.rqrq = rqrq;
	212	+ }
	213	+
	214	+ public Date getRyrq() {
	215	+ return ryrq;
	216	+ }
	217	+
	218	+ public void setRyrq(Date ryrq) {
	219	+ this.ryrq = ryrq;
	220	+ }
	221	+
	222	+ public Date getCqrq() {
	223	+ return cqrq;
	224	+ }
	225	+
	226	+ public void setCqrq(Date cqrq) {
	227	+ this.cqrq = cqrq;
	228	+ }
	229	+
	230	+ public String getKsdm() {
	231	+ return ksdm;
	232	+ }
	233	+
	234	+ public void setKsdm(String ksdm) {
	235	+ this.ksdm = ksdm;
	236	+ }
	237	+
	238	+ public String getBqdm() {
	239	+ return bqdm;
	240	+ }
	241	+
	242	+ public void setBqdm(String bqdm) {
	243	+ this.bqdm = bqdm;
	244	+ }
	245	+
	246	+ public String getMblh() {
	247	+ return mblh;
	248	+ }
	249	+
	250	+ public void setMblh(String mblh) {
	251	+ this.mblh = mblh;
	252	+ }
	253	+
	254	+ public String getMsyxh() {
	255	+ return msyxh;
	256	+ }
	257	+
	258	+ public void setMsyxh(String msyxh) {
	259	+ this.msyxh = msyxh;
	260	+ }
	261	+}

...	...	@@ -22,6 +22,7 @@
22	22
23	23	private String id;
24	24
	25	+ private Boolean hasBlno;
25	26	/**
26	27	* 关键字
27	28	*/
...	...	@@ -837,6 +838,14 @@
837	838	this.visitstatus = visitstatus;
838	839	}
839	840
	841	+ public Boolean getHasBlno() {
	842	+ return hasBlno;
	843	+ }
	844	+
	845	+ public void setHasBlno(Boolean hasBlno) {
	846	+ this.hasBlno = hasBlno;
	847	+ }
	848	+
840	849	@Override
841	850	public MongoQuery convertToQuery() {
842	851	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -850,6 +859,10 @@
850	859	condition = condition.and("endCase", endCase, MongoOper.IS);
851	860	}
852	861
	862	+
	863	+ if (null != hasBlno) {
	864	+ condition = condition.and("blNo", hasBlno, MongoOper.EXISTS);
	865	+ }
853	866
854	867	if (-1 != visitstatus) {
855	868	condition = condition.and("visitstatus", visitstatus, MongoOper.IS);

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.util.Date;
4	3
5		-public class BabyDischargeDiagnosisModel {
	4	+import com.lyms.platform.common.base.IBasicRequestConvert;
	5	+import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.pojo.BabyDiagnoseModel;
	7	+
	8	+public class BabyDischargeDiagnosisModel implements IBasicRequestConvert<BabyDiagnoseModel> {
6	9	//病历号=住院号
7	10	private String blh;
8	11
	12	+ private String syxh;
	13	+
9	14	//出院日期
10	15	private String cyrq;
11	16
12	17
13	18
...	...	@@ -17,10 +22,182 @@
17	22
18	23	//出生日期
19	24	private String birth;
	25	+ private String birthtime;
20	26
	27	+ //出院诊断代码
	28	+ private String cyzddm;
	29	+
21	30	//出院诊断
22	31	private String cyzdmc;
23	32
	33	+ //身份证号
	34	+ private String sfzh;
	35	+
	36	+ //联系电话
	37	+ private String lxdh;
	38	+
	39	+ //联系地址
	40	+ private String lxdz;
	41	+
	42	+ //联系人
	43	+ private String lxr;
	44	+
	45	+ //联系人电话
	46	+ private String lxrdh;
	47	+
	48	+ //当前地址
	49	+ private String curraddr;
	50	+
	51	+
	52	+ //录入日期
	53	+ private String lrrq;
	54	+ private String rqrq;
	55	+
	56	+ //入院日期
	57	+ private String ryrq;
	58	+ private String cqrq;
	59	+
	60	+ private String ksdm;
	61	+ private String bqdm;
	62	+ private String mblh;
	63	+ private String msyxh;
	64	+
	65	+ public String getBirthtime() {
	66	+ return birthtime;
	67	+ }
	68	+
	69	+ public void setBirthtime(String birthtime) {
	70	+ this.birthtime = birthtime;
	71	+ }
	72	+
	73	+ public String getSyxh() {
	74	+ return syxh;
	75	+ }
	76	+
	77	+ public void setSyxh(String syxh) {
	78	+ this.syxh = syxh;
	79	+ }
	80	+
	81	+ public String getCyzddm() {
	82	+ return cyzddm;
	83	+ }
	84	+
	85	+ public void setCyzddm(String cyzddm) {
	86	+ this.cyzddm = cyzddm;
	87	+ }
	88	+
	89	+ public String getSfzh() {
	90	+ return sfzh;
	91	+ }
	92	+
	93	+ public void setSfzh(String sfzh) {
	94	+ this.sfzh = sfzh;
	95	+ }
	96	+
	97	+ public String getLxdh() {
	98	+ return lxdh;
	99	+ }
	100	+
	101	+ public void setLxdh(String lxdh) {
	102	+ this.lxdh = lxdh;
	103	+ }
	104	+
	105	+ public String getLxdz() {
	106	+ return lxdz;
	107	+ }
	108	+
	109	+ public void setLxdz(String lxdz) {
	110	+ this.lxdz = lxdz;
	111	+ }
	112	+
	113	+ public String getLxr() {
	114	+ return lxr;
	115	+ }
	116	+
	117	+ public void setLxr(String lxr) {
	118	+ this.lxr = lxr;
	119	+ }
	120	+
	121	+ public String getLxrdh() {
	122	+ return lxrdh;
	123	+ }
	124	+
	125	+ public void setLxrdh(String lxrdh) {
	126	+ this.lxrdh = lxrdh;
	127	+ }
	128	+
	129	+ public String getCurraddr() {
	130	+ return curraddr;
	131	+ }
	132	+
	133	+ public void setCurraddr(String curraddr) {
	134	+ this.curraddr = curraddr;
	135	+ }
	136	+
	137	+ public String getLrrq() {
	138	+ return lrrq;
	139	+ }
	140	+
	141	+ public void setLrrq(String lrrq) {
	142	+ this.lrrq = lrrq;
	143	+ }
	144	+
	145	+ public String getRqrq() {
	146	+ return rqrq;
	147	+ }
	148	+
	149	+ public void setRqrq(String rqrq) {
	150	+ this.rqrq = rqrq;
	151	+ }
	152	+
	153	+ public String getRyrq() {
	154	+ return ryrq;
	155	+ }
	156	+
	157	+ public void setRyrq(String ryrq) {
	158	+ this.ryrq = ryrq;
	159	+ }
	160	+
	161	+ public String getCqrq() {
	162	+ return cqrq;
	163	+ }
	164	+
	165	+ public void setCqrq(String cqrq) {
	166	+ this.cqrq = cqrq;
	167	+ }
	168	+
	169	+ public String getKsdm() {
	170	+ return ksdm;
	171	+ }
	172	+
	173	+ public void setKsdm(String ksdm) {
	174	+ this.ksdm = ksdm;
	175	+ }
	176	+
	177	+ public String getBqdm() {
	178	+ return bqdm;
	179	+ }
	180	+
	181	+ public void setBqdm(String bqdm) {
	182	+ this.bqdm = bqdm;
	183	+ }
	184	+
	185	+ public String getMblh() {
	186	+ return mblh;
	187	+ }
	188	+
	189	+ public void setMblh(String mblh) {
	190	+ this.mblh = mblh;
	191	+ }
	192	+
	193	+ public String getMsyxh() {
	194	+ return msyxh;
	195	+ }
	196	+
	197	+ public void setMsyxh(String msyxh) {
	198	+ this.msyxh = msyxh;
	199	+ }
	200	+
24	201	public String getBlh() {
25	202	return blh;
26	203	}
...	...	@@ -71,5 +248,67 @@
71	248	}
72	249
73	250
	251	+ @Override
	252	+ public BabyDiagnoseModel convertToDataModel() {
	253	+
	254	+ BabyDiagnoseModel model = new BabyDiagnoseModel();
	255	+ model.setBlh(blh);
	256	+ model.setSyxh(syxh);
	257	+
	258	+ //出院日期
	259	+ model.setCyrq(DateUtil.parseYyyyMMddHHssmm(cyrq));
	260	+
	261	+ //姓名
	262	+ model.setHzxm(hzxm);
	263	+
	264	+ //性别
	265	+ model.setSex(sex);
	266	+
	267	+ //出生日期
	268	+ model.setBirth(DateUtil.parseYYYYMMDD(birth));
	269	+ model.setBirthtime(birthtime);
	270	+
	271	+ //出院诊断代码
	272	+ model.setCyzddm(cyzddm);
	273	+
	274	+ //出院诊断
	275	+ model.setCyzdmc(cyzdmc);
	276	+
	277	+ //身份证号
	278	+ model.setSfzh(sfzh);
	279	+
	280	+ //联系电话
	281	+ model.setLxdh(lxdh);
	282	+
	283	+ //联系地址
	284	+ model.setLxdz(lxdz);
	285	+
	286	+ //联系人
	287	+ model.setLxr(lxr);
	288	+
	289	+ //联系人电话
	290	+ model.setLxrdh(lxrdh);
	291	+
	292	+ //当前地址
	293	+ model.setCurraddr(curraddr);
	294	+
	295	+ //录入日期
	296	+
	297	+ model.setLrrq(DateUtil.parseYyyyMMddHHssmm(lrrq));
	298	+ model.setRqrq(DateUtil.parseYyyyMMddHHssmm(rqrq));
	299	+
	300	+ //入院日期
	301	+ model.setRyrq(DateUtil.parseYyyyMMddHHssmm(ryrq));
	302	+ model.setCqrq(DateUtil.parseYyyyMMddHHssmm(cqrq));
	303	+
	304	+ model.setKsdm(ksdm);
	305	+ model.setBqdm(bqdm);
	306	+ model.setMblh(mblh);
	307	+ model.setMsyxh(msyxh);
	308	+
	309	+ model.setIsbuild(1);
	310	+
	311	+ return model;
	312	+ }
74	313	}

	1	+package com.lyms.hospitalapi.pojo;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2019-06-24.
	5	+ */
	6	+public class NewBabyDiagnoseModel {
	7	+
	8	+}

...	...	@@ -833,26 +833,27 @@
833	833	Map<String, Object> map = new HashMap<>();
834	834	StringBuffer sb = new StringBuffer();
835	835	if (StringUtils.isNotBlank(blNo)) {
836		- Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeFmConnection();
	836	+// Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeFmConnection();
	837	+ Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
837	838	QueryRunner queryRunner = new QueryRunner();
838	839
839	840	try {
840		- // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
841		- List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '" + blNo + "'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
	841	+ //List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '" + blNo + "'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
	842	+ List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
842	843	if (CollectionUtils.isNotEmpty(list)) {
843		-// for (DiagnosisInfo info:list) {
844		-// map.put("diagnosisItem", info.getDiagnosisItem());
845		-// break;
846		-// }
847		-
848		- for (int i = 0; i < list.size(); i++) {
849		- if (i < list.size() - 1) {
850		- sb.append(list.get(i).getDiagnosisItem());
851		- sb.append(", ");
852		- } else {
853		- sb.append(list.get(i).getDiagnosisItem());
854		- }
	844	+ for (DiagnosisInfo info:list) {
	845	+ map.put("diagnosisItem", info.getDiagnosisItem());
	846	+ break;
855	847	}
	848	+
	849	+// for (int i = 0; i < list.size(); i++) {
	850	+// if (i < list.size() - 1) {
	851	+// sb.append(list.get(i).getDiagnosisItem());
	852	+// sb.append(", ");
	853	+// } else {
	854	+// sb.append(list.get(i).getDiagnosisItem());
	855	+// }
	856	+// }
856	857	}
857	858	DbUtils.closeQuietly(conn);
858	859	} catch (SQLException e) {
...	...	@@ -860,7 +861,7 @@
860	861	e.printStackTrace();
861	862	}
862	863	}
863		- map.put("diagnosisItem", sb.toString());
	864	+ //map.put("diagnosisItem", sb.toString());
864	865	return map;
865	866	}
866	867
867	868
868	869
869	870
870	871
...	...	@@ -976,17 +977,31 @@
976	977	return objectResponse;
977	978	}
978	979
979		- public static void main(String[] args) {
980		- String str = "20160504121330";
981		- SimpleDateFormat sdfcyrq = new SimpleDateFormat("yyyyMMddHHmmss");
	980	+
	981	+ public List<BabyDischargeDiagnosisModel> queryNewBabyDiagnose(String lrrqStart, String lrrqEnd) {
	982	+
	983	+ Connection conn = null;
	984	+ String sql = "select blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and mblh is null ";
982	985	try {
983		- Date date = sdfcyrq.parse(str);
984		- System.out.println(date);
985		- } catch (Exception e) {
986	986
987		- }
	987	+ if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) {
	988	+ sql = " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
	989	+ }
988	990
989		- }
	991	+ conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
	992	+ QueryRunner queryRunner = new QueryRunner();
990	993
	994	+ List<BabyDischargeDiagnosisModel> list = queryRunner.query(conn, sql, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
	995	+ return list;
	996	+ }
	997	+ catch (Exception e)
	998	+ {
	999	+ ExceptionUtils.catchException(e,"queryNewBabyDiagnose error. sql:"+sql);
	1000	+ }
	1001	+ finally {
	1002	+ DbUtils.closeQuietly(conn);
	1003	+ }
	1004	+ return null;
	1005	+ }
991	1006	}

...	...	@@ -568,6 +568,23 @@
568	568
569	569
570	570	/**
	571	+ * 处理历史数据按照时间返回获取保存，格式：lrrqStart=2019062414:41:00&lrrqEnd=2019062418:41:00
	572	+ * @param lrrqStart
	573	+ * @param lrrqEnd
	574	+ * @return
	575	+ */
	576	+ @ResponseBody
	577	+ @RequestMapping(value = "/queryNewBabyDiagnose", method = RequestMethod.GET)
	578	+ 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);
	583	+ }
	584	+
	585	+
	586	+
	587	+ /**
571	588	* 获取可以导出的医院列表
572	589	*
573	590	* @param request

...	...	@@ -34,6 +34,7 @@
34	34	import com.lyms.platform.operate.web.worker.*;
35	35	import com.lyms.platform.permission.dao.master.CouponMapper;
36	36	import com.lyms.platform.permission.model.*;
	37	+import com.lyms.platform.permission.service.BabyDiagnoseService;
37	38	import com.lyms.platform.permission.service.CouponService;
38	39	import com.lyms.platform.permission.service.OrganizationService;
39	40	import com.lyms.platform.permission.service.PatientServiceService;
...	...	@@ -1322,6 +1323,71 @@
1322	1323	//
1323	1324	// return "updateBabyGrowth finish";
1324	1325	// }
	1326	+
	1327	+
	1328	+
	1329	+
	1330	+
	1331	+
	1332	+
	1333	+
	1334	+
	1335	+ @Autowired
	1336	+ private BabyDiagnoseService babyDiagnoseService;
	1337	+
	1338	+
	1339	+ @RequestMapping(value = "/updateBabyDiagnoseIsBuild", method = RequestMethod.GET)
	1340	+ @ResponseBody
	1341	+ public String updateBabyDiagnoseIsBuild(@RequestParam(required = true) String hid) {
	1342	+
	1343	+ BabyModelQuery babyModelQuery = new BabyModelQuery();
	1344	+ babyModelQuery.setYn(YnEnums.YES.getId());
	1345	+ babyModelQuery.setHospitalId(hid);
	1346	+ babyModelQuery.setHasBlno(true);
	1347	+
	1348	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
	1349	+ if (CollectionUtils.isNotEmpty(models)) {
	1350	+ int batchSize = 500;
	1351	+ int end = 0;
	1352	+ for (int i = 0; i < models.size(); i += batchSize) {
	1353	+ end = (end + batchSize);
	1354	+ if (end > models.size()) {
	1355	+ end = models.size();
	1356	+ }
	1357	+ System.out.println("start:" + i + ",end:" + end);
	1358	+ final List<BabyModel> tempList = models.subList(i, end);
	1359	+ new Thread(new Runnable() {
	1360	+ @Override
	1361	+ public void run() {
	1362	+ if (CollectionUtils.isNotEmpty(tempList)) {
	1363	+ BabyDiagnoseModel model = new BabyDiagnoseModel();
	1364	+ model.setIsbuild(2);
	1365	+
	1366	+ for (BabyModel babyModel : tempList) {
	1367	+ if (babyModel != null && StringUtils.isNotEmpty(babyModel.getBlNo())) {
	1368	+ model.setBlh(babyModel.getBlNo());
	1369	+ babyDiagnoseService.updateBabyDiagnose(model);
	1370	+ System.out.println(babyModel.getBlNo());
	1371	+ }
	1372	+ }
	1373	+ }
	1374	+ }
	1375	+ }).start();
	1376	+ }
	1377	+ }
	1378	+
	1379	+
	1380	+ return "updateBabyDiagnoseIsBuild finish";
	1381	+ }
	1382	+
	1383	+
	1384	+
	1385	+
	1386	+
	1387	+
	1388	+
	1389	+
	1390	+
1325	1391
1326	1392
1327	1393	/**

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.hospitalapi.dzfy.DzfyHisService;
4	4	import com.lyms.hospitalapi.fnfy.FnfyHisService;
5	5	import com.lyms.hospitalapi.lcdcf.LcdcfHisService;
	6	+import com.lyms.hospitalapi.pojo.BabyDischargeDiagnosisModel;
6	7	import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
7	8	import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService;
8	9	import com.lyms.hospitalapi.v2.HisService;
...	...	@@ -27,10 +28,7 @@
27	28	import com.lyms.platform.operate.web.utils.GrowthCountTask;
28	29	import com.lyms.platform.operate.web.utils.MongoUtil;
29	30	import com.lyms.platform.permission.model.*;
30		-import com.lyms.platform.permission.service.CouponService;
31		-import com.lyms.platform.permission.service.OrganizationService;
32		-import com.lyms.platform.permission.service.PatientServiceService;
33		-import com.lyms.platform.permission.service.UsersService;
	31	+import com.lyms.platform.permission.service.*;
34	32	import com.lyms.platform.pojo.*;
35	33	import com.lyms.platform.query.*;
36	34	import org.apache.commons.collections.CollectionUtils;
...	...	@@ -47,6 +45,7 @@
47	45	import javax.servlet.http.HttpServletResponse;
48	46	import java.io.IOException;
49	47	import java.io.OutputStream;
	48	+import java.text.SimpleDateFormat;
50	49	import java.util.*;
51	50	import java.util.concurrent.Callable;
52	51	import java.util.concurrent.Future;
53	52
...	...	@@ -78,7 +77,11 @@
78	77	@Autowired
79	78	private QhdfyHisService qhdfyHisService;
80	79
	80	+
81	81	@Autowired
	82	+ private BabyDiagnoseService babyDiagnoseService;
	83	+
	84	+ @Autowired
82	85	private DzfyHisService dzfyHisService;
83	86
84	87	@Autowired
...	...	@@ -778,20 +781,8 @@
778	781	}
779	782	//创建建档短信
780	783	createBuildMsg(model);
781		-// new Thread(new Runnable() {
782		-// @Override
783		-// public void run() {
784		-// BabyModelQuery babyQuery = new BabyModelQuery();
785		-// babyQuery.setYn(YnEnums.YES.getId());
786		-// babyQuery.setId(bId);
787		-// List<BabyModel> list = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
788		-// if (CollectionUtils.isNotEmpty(list))
789		-// {
790		-// createBuildMsg(list.get(0));
791		-//// createExtensionMsg(list.get(0));
792		-// }
793		-// }
794		-// },"babyBuildMsgThead").start();
	784	+ handleBabyDiangose(request.getBlNo(),hid);
	785	+
795	786	br.setErrorcode(ErrorCodeConstants.SUCCESS);
796	787	br.setErrormsg("成功");
797	788	br.setData(bId);
...	...	@@ -803,6 +794,23 @@
803	794	}
804	795
805	796	/**
	797	+ * 秦皇岛妇幼儿童建档后根据住院号更新诊断记录为已经建档状态
	798	+ */
	799	+ private void handleBabyDiangose(String blh,String hospitalId)
	800	+ {
	801	+ if ("216".equals(hospitalId) && StringUtils.isNotEmpty(blh))
	802	+ {
	803	+ BabyDiagnoseModel model = new BabyDiagnoseModel();
	804	+ model.setIsbuild(2);
	805	+ model.setBlh(blh);
	806	+ babyDiagnoseService.updateBabyDiagnose(model);
	807	+ }
	808	+
	809	+ }
	810	+
	811	+
	812	+
	813	+ /**
806	814	* 添加或更新追访信息
807	815	*
808	816	* @param userId
...	...	@@ -4040,6 +4048,74 @@
4040	4048	return qhdfyHisService.getBabyDiacrisis(startDischargeDate, endDischargeDate, startBirthDate, endBirthDate, hospitalizationNo, babyName, finalDiagnosis, page, limit);
4041	4049
4042	4050	}
	4051	+
	4052	+
	4053	+ /**
	4054	+ * 查询一段时间新生儿诊断记录
	4055	+ * @param lrrqStart 录入日期开始
	4056	+ * @param lrrqEnd 录入日期结束
	4057	+ */
	4058	+ public BaseObjectResponse queryNewBabyDiagnose(String lrrqStart, String lrrqEnd) {
	4059	+
	4060	+ int size = handleBabyDiagnose(lrrqStart, lrrqEnd);
	4061	+ return new BaseObjectResponse()
	4062	+ .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(size);
	4063	+ }
	4064	+
	4065	+
	4066	+ /**
	4067	+ * 处理数据
	4068	+ * @param lrrqStart
	4069	+ * @param lrrqEnd
	4070	+ * @return
	4071	+ */
	4072	+ public int handleBabyDiagnose(String lrrqStart, String lrrqEnd)
	4073	+ {
	4074	+ List<BabyDischargeDiagnosisModel> list = qhdfyHisService.queryNewBabyDiagnose(lrrqStart, lrrqEnd);
	4075	+
	4076	+ if (CollectionUtils.isNotEmpty(list))
	4077	+ {
	4078	+ Map param = new HashMap();
	4079	+ for (BabyDischargeDiagnosisModel model : list)
	4080	+ {
	4081	+ param.put("blh",model.getBlh());
	4082	+
	4083	+ try {
	4084	+ List<BabyDiagnoseModel> dbList = babyDiagnoseService.queryBabyDiagnoses(param);
	4085	+ if (CollectionUtils.isEmpty(dbList))
	4086	+ {
	4087	+ BabyDiagnoseModel babyDiagnoseModel = model.convertToDataModel();
	4088	+ babyDiagnoseService.addBabyDiagnose(babyDiagnoseModel);
	4089	+ System.out.println("handleBabyDiagnose success "+ model.getBlh());
	4090	+ }
	4091	+ }
	4092	+ catch (Exception e)
	4093	+ {
	4094	+ ExceptionUtils.catchException(e, "handleBabyDiagnose error.");
	4095	+ continue;
	4096	+ }
	4097	+ }
	4098	+ }
	4099	+
	4100	+ return CollectionUtils.isNotEmpty(list) ? list.size() : 0;
	4101	+ }
	4102	+
	4103	+
	4104	+ /**
	4105	+ * 获取当前时间前一个小时的数据
	4106	+ */
	4107	+ public void autoGetBabyDiagnose() {
	4108	+
	4109	+ Date end = new Date();
	4110	+ Date start = new Date(end.getTime() - 3600000);
	4111	+
	4112	+ String lrrqStart = DateUtil.getYyyyMMddHHssmm(start);
	4113	+ String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end);
	4114	+
	4115	+ int size = handleBabyDiagnose(lrrqStart, lrrqEnd);
	4116	+ System.out.println("autoGetBabyDiagnose size " + size);
	4117	+ }
	4118	+
4043	4119
4044	4120
4045	4121	}