jiangjiazhi / regional-platform

Commit f4b4aa0a4b18d131caa165f120a7306dae7b151c

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 42 additions and 20 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-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java

...	...	@@ -16,6 +16,8 @@
16	16
17	17	void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel);
18	18
	19	+ void updateBabyDiagnoseType(BabyDiagnoseModel diagnoseModel);
	20	+
19	21	List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query);
20	22
21	23

...	...	@@ -15,6 +15,7 @@
15	15	List<BabyDiagnoseModel> queryBabyDiagnoses(Map param);
16	16
17	17	void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel);
	18	+ void updateBabyDiagnoseType(BabyDiagnoseModel diagnoseModel);
18	19
19	20	List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query);
20	21	}

...	...	@@ -33,6 +33,10 @@
33	33	public void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel) {
34	34	babyDiagnoseMapper.updateBabyDiagnose(diagnoseModel);
35	35	}
	36	+ @Override
	37	+ public void updateBabyDiagnoseType(BabyDiagnoseModel diagnoseModel) {
	38	+ babyDiagnoseMapper.updateBabyDiagnoseType(diagnoseModel);
	39	+ }
36	40
37	41	@Override
38	42	public List<BabyDiagnoseModel> queryBabyDiagnosesList(BabyDiagnoseQuery query) {

...	...	@@ -36,11 +36,11 @@
36	36	<insert id="addBabyDiagnose" parameterType="com.lyms.platform.pojo.BabyDiagnoseModel">
37	37	<selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer">SELECT LAST_INSERT_ID()</selectKey>
38	38	INSERT INTO lyms_baby_diagnose
39		- (blh,syxh,hzxm,birth,
	39	+ (type,blh,syxh,hzxm,birth,
40	40	birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,
41	41	curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,
42	42	cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild)
43		- VALUES (#{blh},#{syxh},#{hzxm},#{birth},
	43	+ VALUES (#{type},#{blh},#{syxh},#{hzxm},#{birth},
44	44	#{birthtime},#{sex},#{sfzh},#{lxdh},#{lxdz},#{lxr},#{lxrdh},
45	45	#{curraddr},#{lrrq},#{ryrq},#{rqrq},#{cyrq},#{cqrq},#{cyzddm},
46	46	#{cyzdmc},#{ksdm},#{bqdm},#{mblh},#{msyxh},#{isbuild})
47	47
...	...	@@ -87,7 +87,17 @@
87	87	where blh = #{blh,jdbcType=VARCHAR}
88	88
89	89	</update>
	90	+ <update id="updateBabyDiagnoseType" parameterType="com.lyms.platform.pojo.BabyDiagnoseModel">
	91	+ UPDATE
	92	+ lyms_baby_diagnose
	93	+ <set>
	94	+ <if test="type != null">
	95	+ type = #{type,jdbcType=VARCHAR},
	96	+ </if>
	97	+ </set>
	98	+ where blh = #{blh,jdbcType=VARCHAR}
90	99
	100	+ </update>
91	101	<sql id="babyDiagnosesCondition">
92	102	<where>
93	103	1=1

...	...	@@ -1024,14 +1024,14 @@
1024	1024	if("1".equals(type)){
1025	1025	Connection conn = null;
1026	1026	// 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 ";
1027		- String sql = "select type='1',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 ksdm ='2545' and bqdm <> '206' ";
	1027	+ String sql = "select type='1',blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq," +
	1028	+ "rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and ksdm ='2545' and bqdm = '206' ";
1028	1029	try {
1029	1030	if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) {
1030	1031	sql += " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
1031	1032	}
1032	1033	conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
1033	1034	QueryRunner queryRunner = new QueryRunner();
1034		-
1035	1035	list = queryRunner.query(conn, sql, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
1036	1036	} catch (Exception e) {
1037	1037	ExceptionUtils.catchException(e, "queryNewBabyDiagnose error. sql:" + sql);
1038	1038
...	...	@@ -1039,12 +1039,13 @@
1039	1039	DbUtils.closeQuietly(conn);
1040	1040	}
1041	1041	// 2 获取诊断详情结果遍历填充到list详情字段
1042		- getDetails(list, conn, sql);
	1042	+ getDetails(list, conn);
1043	1043
1044	1044	}//产科住院数据
1045	1045	else if ("2".equals(type)){
1046	1046	Connection conn = null;
1047		- String sql = "select type='2',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 ksdm ='2545' and bqdm <> '206' ";
	1047	+ String sql = "select type='2',blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq," +
	1048	+ "rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and ksdm ='2545' and bqdm <> '206' ";
1048	1049	try {
1049	1050	if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) {
1050	1051	sql += " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)";
...	...	@@ -1058,7 +1059,7 @@
1058	1059	} finally {
1059	1060	DbUtils.closeQuietly(conn);
1060	1061	}
1061		- getDetails(list, conn, sql);
	1062	+ getDetails(list, conn);
1062	1063	}
1063	1064
1064	1065
1065	1066
1066	1067
1067	1068
1068	1069
1069	1070
...	...	@@ -1066,25 +1067,26 @@
1066	1067	return list;
1067	1068	}
1068	1069
1069		- private void getDetails(List<BabyDischargeDiagnosisModel> list, Connection conn, String sql) {
	1070	+ private void getDetails(List<BabyDischargeDiagnosisModel> list, Connection conn) {
1070	1071	if(CollectionUtils.isNotEmpty(list)){
1071	1072	for (int i = 0; i <list.size() ; i++) {
1072	1073	BabyDischargeDiagnosisModel babyDischargeDiagnosisModel = list.get(i);
1073	1074	if(babyDischargeDiagnosisModel!=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel.getSyxh())){
1074		- String sqlstr = "select ZDMC as cyzdmc from jhemr.v_卫宁诊断数据 where syxh='"+babyDischargeDiagnosisModel.getSyxh()+"' ORDER BY ZDRQ desc;";
	1075	+ String sqlstr = "select ZDMC as cyzdmc from jhemr.v_卫宁诊断数据 where syxh='"+babyDischargeDiagnosisModel.getSyxh()+"' ORDER BY ZDRQ desc ";
1075	1076	try {
1076	1077	conn = ConnTools.qhdzdConnection();
1077		- System.out.println("获取80数据库连接："+conn);
1078	1078	QueryRunner queryRunner = new QueryRunner();
1079		- List<BabyDischargeDiagnosisModel> listxq = queryRunner.query(conn, sql, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
	1079	+ List<BabyDischargeDiagnosisModel> listxq = queryRunner.query(conn, sqlstr, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
1080	1080	String cyzdxq = "";
1081	1081	for (int j = 0; j < listxq.size(); j++) {
1082		- BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(i);
	1082	+ BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j);
1083	1083	if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){
1084	1084	cyzdxq = babyDischargeDiagnosisModel1.getCyzdmc()+" ";
1085	1085	}
1086	1086	}
1087		- babyDischargeDiagnosisModel.setCyzdmc(cyzdxq);//将诊断详情覆盖以前的主要诊断
	1087	+ if(StringUtils.isNotEmpty(cyzdxq)){
	1088	+ babyDischargeDiagnosisModel.setCyzdmc(cyzdxq);//将诊断详情覆盖以前的主要诊断
	1089	+ }
1088	1090	} catch (SQLException e) {
1089	1091	e.printStackTrace();
1090	1092	}finally {

...	...	@@ -4436,14 +4436,12 @@
4436	4436	* @Date: 2020/7/14 10:13
4437	4437	*/
4438	4438	public int handleBabyDiagnoseQhd(String lrrqStart, String lrrqEnd, String type) {
4439		-
4440	4439	List<BabyDischargeDiagnosisModel> list = qhdfyHisService.queryNewBabyDiagnoseQhd(lrrqStart, lrrqEnd,type);
4441	4440
4442	4441	if (CollectionUtils.isNotEmpty(list)) {
4443	4442	Map param = new HashMap();
4444	4443	for (BabyDischargeDiagnosisModel model : list) {
4445	4444	param.put("blh", model.getBlh());
4446		-
4447	4445	try {
4448	4446	List<BabyDiagnoseModel> dbList = babyDiagnoseService.queryBabyDiagnoses(param);
4449	4447	if (CollectionUtils.isEmpty(dbList)) {
...	...	@@ -4451,7 +4449,10 @@
4451	4449	/* 注意：会有个问题，就是以前历史数据会不能区分是1 新生儿科或2 产科住院数据*/
4452	4450	babyDiagnoseModel.setType(type);
4453	4451	babyDiagnoseService.addBabyDiagnose(babyDiagnoseModel);
4454		- System.out.println("handleBabyDiagnose success " + model.getBlh());
	4452	+ }else if (CollectionUtils.isNotEmpty(dbList)) {
	4453	+ BabyDiagnoseModel babyDiagnoseModel = dbList.get(0);
	4454	+ babyDiagnoseModel.setType(type);
	4455	+ babyDiagnoseService.updateBabyDiagnoseType(babyDiagnoseModel);
4455	4456	}
4456	4457	} catch (Exception e) {
4457	4458	ExceptionUtils.catchException(e, "handleBabyDiagnose error.");
4458	4459
...	...	@@ -4475,11 +4476,13 @@
4475	4476	String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end);
4476	4477	System.out.println("lrrqStart =" + lrrqStart);
4477	4478	System.out.println("lrrqEnd =" + lrrqEnd);
4478		- int size = handleBabyDiagnose(lrrqStart, lrrqEnd);
	4479	+// int size = handleBabyDiagnose(lrrqStart, lrrqEnd);
4479	4480	//秦皇岛诊断数据定时同步到mysql数据库中
4480		-// int size1 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"1");
4481		-// int size2 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"2");
4482		- System.out.println("autoGetBabyDiagnose size " + size);
	4481	+ int size1 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"1");
	4482	+ System.out.println("autoGetBabyDiagnose size1 " + size1);
	4483	+ int size2 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"2");
	4484	+ System.out.println("autoGetBabyDiagnose size2 " + size2);
	4485	+
4483	4486	}
4484	4487
4485	4488