jiangjiazhi / regional-platform

Commit c258b966818d48c5cefaa0bc4bb55ebb5b8fde33

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/SaveChildHealthExamInfo.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/SaveChildInfo.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/Public2PathController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/Public2PathFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java

...	...	@@ -757,7 +757,7 @@
757	757	//儿童健康检查表单编号
758	758	private String childHealthExamFormNo;
759	759	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
760		- private String visitType;
	760	+ private Integer visitType;
761	761	//选项指标记录
762	762	private List<Object> recordChoice;
763	763
764	764
...	...	@@ -817,11 +817,11 @@
817	817	this.childHealthExamFormNo = childHealthExamFormNo;
818	818	}
819	819
820		- public String getVisitType() {
	820	+ public Integer getVisitType() {
821	821	return visitType;
822	822	}
823	823
824		- public void setVisitType(String visitType) {
	824	+ public void setVisitType(Integer visitType) {
825	825	this.visitType = visitType;
826	826	}
827	827

	1	+package com.lyms.hospitalapi.lhxfy.model;
	2	+
	3	+import com.lyms.platform.biz.service.BabyBookbuildingService;
	4	+import com.lyms.platform.common.enums.YnEnums;
	5	+import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.common.utils.StringUtils;
	7	+import com.lyms.platform.permission.dao.master.CouponMapper;
	8	+import com.lyms.platform.pojo.BabyCheckModel;
	9	+import com.lyms.platform.pojo.BabyModel;
	10	+import com.lyms.platform.pojo.NewbornVisit;
	11	+import com.lyms.platform.query.BabyModelQuery;
	12	+import org.springframework.beans.factory.annotation.Autowired;
	13	+
	14	+import java.util.ArrayList;
	15	+import java.util.HashMap;
	16	+import java.util.List;
	17	+
	18	+/**
	19	+ * 公卫2.0-新增儿童健康检查
	20	+ */
	21	+public class SaveChildHealthExamInfo {
	22	+ private Integer isAppCreate; //类型：Number 必有字段备注：各厂商对接时，再确定具体的值
	23	+ private String followupVisitDate; //类型：String 必有字段备注：随访日期
	24	+ private String standard; //类型：String 必有字段备注：国家规范版本号（2017）
	25	+ private String followupDoctorId; //类型：String 必有字段备注：本次随访医师ID
	26	+ private String followupVisitDoctorName; //类型：String 必有字段备注：随访医师姓名
	27	+ private String ageCode; //类型：String 必有字段备注：月龄/年龄参考第三版国家规范，和规范上的项目一致
	28	+ private String weightEvalCode; //类型：String 必有字段备注：年龄别体重评价结果代码
	29	+ private String sickVisitCode; //类型：String 可有字段备注：两次随访间患病标志
	30	+ private String pneumVisitTimes; //类型：String 可有字段备注：两次随访间患肺炎住院次数
	31	+ private String editMedicine; //类型：Boolean 可有字段备注：无
	32	+ private String diarrheaVisitTimes; //类型：String 可有字段备注：两次随访间患腹泻住院次数
	33	+ private String traumaVisitTimes; //类型：String 可有字段备注：两次随访间因外伤住院次数
	34	+ private String othersVisitDesc; //类型：String 可有字段备注：两次随访间患其他疾病情况
	35	+ private String childHealthExam; //类型：String 可有字段备注：无
	36	+ private String referralContacts; //类型：String 可有字段备注：转诊联系人(济南规范)
	37	+ private String kinderGartenName; //类型：String 可有字段备注：幼儿园名称(济南规范)
	38	+ private String healthManagementName; //类型：String 可有字段备注：健康管理联系人(济南规范)
	39	+ private String healthManagementTel; //类型：String 可有字段备注：健康管理联系人电话(济南规范)
	40	+ private String checkOrgCode; //类型：String 可有字段备注：查体机构代码(1本机构2幼儿园3其他医疗机构)(济南规范)
	41	+ private String checkOrgValue; //类型：String 可有字段备注：查体机构中文(济南规范)
	42	+ private String referralResultCode; //类型：String 可有字段备注：转诊结果(1到位2未到位)(济南规范)
	43	+ private String referralTel; //类型：String 可有字段备注：转诊电话(济南规范)
	44	+ private String skinAbnormCode; //类型：String 可有字段备注：皮肤检查异常标志
	45	+ private String bregmaCloseCode; //类型：String 可有字段备注：前囟闭合标志
	46	+ private String eyeAbnormCode; //类型：String 可有字段备注：眼外观检查异常标志
	47	+ private String neckMassCode; //类型：String 可有字段备注：颈部包块标志
	48	+ private String physicalDevelopEvalCode; //类型：String 可有字段备注：体格发育评价代码
	49	+ private String lungAbnormCode; //类型：String 可有字段备注：肺部听诊异常标志
	50	+ private String weightDivHeight; //类型：String 可有字段备注：体重/身高
	51	+ private String weightDivHeightEvalCode; //类型：String 可有字段备注：年龄别体重/身高评价结果代码
	52	+ private String childComplexionCode; //类型：String 可有字段备注：儿童面色代码
	53	+ private String heightEvalCode; //类型：String 可有字段备注：年龄别身高评价结果代码
	54	+ private String hearingScreenResultCode; //类型：String 可有字段备注：听力筛查结果代码
	55	+ private String abdomenAbnormCode; //类型：String 可有字段备注：腹部触诊异常标志
	56	+ private String limbsAbnormCode; //类型：String 可有字段备注：四肢活动度异常标志
	57	+ private String oralAbnormCode; //类型：String 可有字段备注：口腔检查异常标志
	58	+ private String heartAbnormCode; //类型：String 可有字段备注：心脏听诊异常标志（新版为胸部）
	59	+ private String anusAbnormCode; //类型：String 可有字段备注：肛门检查异常标志
	60	+ private String gaitAbnormCode; //类型：String 可有字段备注：步态异常标志
	61	+ private String earAbnormCode; //类型：String 可有字段备注：耳外观检查异常标志
	62	+ private String developPassCode; //类型：String 可有字段备注：儿童发育评估通过标志
	63	+ private String referralCode; //类型：String 可有字段备注：转诊标志
	64	+ private String referralReason; //类型：String 可有字段备注：转诊原因
	65	+ private Object midicine; //类型：Object 必有字段备注：无
	66	+ private List<Object> recordChoice; //类型：Array 必有字段备注：选项指标记录（满月指导 oneAgeGuide 3月龄可疑佝偻病症状 ricketsSymptoms 可疑佝偻病体征 ricketsSign13 发育评估 developPass 指导 oneAgeGuide 6月龄中医药健康管理服务 childTcmGuide12 可疑佝偻病症状 ricketsSymptoms 可疑佝偻病体征 ricketsSign68 发育评估 developPass 指导 oneAgeGuide 8月龄可疑佝偻病症状 ricketsSymptoms 可疑佝偻病体征 ricketsSign68 发育评估 developPass 指导 oneAgeGuide 12月龄中医药健康管理服务 childTcmGuide12 可疑佝偻病体征 ricketsSign1224 发育评估 developPass 指导 oneAgeGuide 18月龄中医药健康管理服务 childTcmGuide24 可疑佝偻病体征 ricketsSign1224 发育评估 developPass 指导 oneAgeGuide 24月龄中医药健康管理服务 childTcmGuide24 可疑佝偻病体征 ricketsSign1224 发育评估 developPass 指导 childGuideAfter18 30月龄中医药健康管理服务 childTcmGuide36 可疑佝偻病体征 ricketsSign1224 发育评估 developPass 指导 childGuideAfter18 3岁中医药健康管理服务 childTcmGuide36 发育评估 developPass 指导 childGuideAfter18 4岁发育评估 developPass 指导 childGuideAfter18 5岁发育评估 developPass 指导 childGuideAfter18 6岁发育评估 developPass 指导 childGuideAfter18）
	67	+ private String nextVisitTypeCode; //类型：String 必有字段备注：下次一次随访类型
	68	+ private String weight; //类型：String 可有字段备注：体重(kg)
	69	+ private String height; //类型：String 可有字段备注：身长(cm)
	70	+ private String headCircumference; //类型：String 可有字段备注：头围（cm)
	71	+ private String bregmaHorizDiameter; //类型：String 可有字段备注：前囟横径(cm)
	72	+ private String bregmaVertDiameter; //类型：String 可有字段备注：前囟纵径(cm)
	73	+ private String umbcordFallCode; //类型：String 可有字段备注：脐带脱落标志
	74	+ private String outdoorActHours; //类型：String 可有字段备注：户外活动时长（h)
	75	+ private String vitamindDose; //类型：String 可有字段备注：服用维生素D剂量（IU/d)1-8月龄
	76	+ private String nextFollowupDate; //类型：String 可有字段备注：下次随访日期
	77	+ private String newbornName; //类型：String 必有字段备注：姓名
	78	+ private String childHealthExamFormNo; //类型：String 必有字段备注：儿童健康检查表单编号
	79	+ private String personInfoId; //类型：String 必有字段备注：个人档案ID
	80	+ private Integer visitType; //类型：Number 必有字段备注：儿童随访类型: 1：新生儿家庭访视，2：1岁以内随访，3：1~2岁随访，4：3~6岁随访
	81	+ private Integer teethCount; //类型：Number 可有字段备注：出牙数
	82	+ private String refertoOrgName; //类型：String 可有字段备注：转入医疗机构名称
	83	+ private Integer cariesCount; //类型：Number 可有字段备注：龋齿数(颗）
	84	+ private String vitamindName; //类型：String 可有字段备注：12-30月龄服用维生素D、3-6岁视力用此字段
	85	+ private String hgb; //类型：String 可有字段备注：血红蛋白
	86	+
	87	+ @Autowired
	88	+ BabyBookbuildingService babyBookbuildingService;
	89	+
	90	+ public void convertToDataModel(BabyCheckModel checkModel) {
	91	+ setIsAppCreate(null==checkModel.getIsAppCreate()?0:checkModel.getIsAppCreate());
	92	+ setFollowupVisitDate(StringUtils.isEmpty(checkModel.getFollowupVisitDate())?"无":checkModel.getFollowupVisitDate());
	93	+ setStandard(StringUtils.isEmpty(checkModel.getStandard())?"无":checkModel.getStandard());
	94	+ setFollowupDoctorId(StringUtils.isEmpty(checkModel.getFollowupDoctorId())?"无":checkModel.getFollowupDoctorId());
	95	+ setFollowupVisitDoctorName(StringUtils.isEmpty(checkModel.getFollowupVisitDoctorName())?"无":checkModel.getFollowupVisitDoctorName());
	96	+ setAgeCode(null==checkModel.getCheckMonth()?"0":checkModel.getCheckMonth().toString());
	97	+ setWeightEvalCode("0");//?
	98	+ setSickVisitCode(null);
	99	+ setPneumVisitTimes(null);
	100	+ setEditMedicine(null);
	101	+ setDiarrheaVisitTimes(null);
	102	+ setTraumaVisitTimes(null);
	103	+ setOthersVisitDesc(null);
	104	+ setChildHealthExam(null);
	105	+ setReferralContacts(null);
	106	+ setKinderGartenName(null);
	107	+ setHealthManagementName(null);
	108	+ setHealthManagementTel(null);
	109	+ setCheckOrgCode(null);
	110	+ setCheckOrgValue(null);
	111	+ setReferralResultCode(null);
	112	+ setReferralTel(null);
	113	+ setSkinAbnormCode(null);
	114	+ setBregmaCloseCode(null);
	115	+ setEyeAbnormCode(null);
	116	+ setNeckMassCode(null);
	117	+ setPhysicalDevelopEvalCode(null);
	118	+ setLungAbnormCode(null);
	119	+ setWeightDivHeight(null);
	120	+ setWeightDivHeightEvalCode(null);
	121	+ setChildComplexionCode(null);
	122	+ setHeightEvalCode(null);
	123	+ setHearingScreenResultCode(null);
	124	+ setAbdomenAbnormCode(null);
	125	+ setLimbsAbnormCode(null);
	126	+ setOralAbnormCode(null);
	127	+ setHeartAbnormCode(null);
	128	+ setAnusAbnormCode(null);
	129	+ setGaitAbnormCode(null);
	130	+ setEarAbnormCode(null);
	131	+ setDevelopPassCode(null);
	132	+ setReferralCode(null);
	133	+ setReferralReason(null);
	134	+ setMidicine(new HashMap<>());//?
	135	+ setRecordChoice(new ArrayList<Object>());//?
	136	+ setNextVisitTypeCode(StringUtils.isEmpty(checkModel.getNextSfType())?"无":checkModel.getNextSfType());
	137	+ setWeight(null);
	138	+ setHeight(null);
	139	+ setHeadCircumference(null);
	140	+ setBregmaHorizDiameter(null);
	141	+ setBregmaVertDiameter(null);
	142	+ setUmbcordFallCode(null);
	143	+ setOutdoorActHours(null);
	144	+ setVitamindDose(null);
	145	+ setNextFollowupDate(null);
	146	+ BabyModel babyModel = babyBookbuildingService.queryBabyById(checkModel.getBuildId());
	147	+ setNewbornName(StringUtils.isEmpty(babyModel.getName())?"无":babyModel.getName());
	148	+ setChildHealthExamFormNo(StringUtils.isEmpty(checkModel.getChildHealthExamFormNo())?"无":checkModel.getChildHealthExamFormNo());
	149	+ setPersonInfoId(StringUtils.isEmpty(checkModel.getBuildId())?"无":checkModel.getBuildId());
	150	+ setVisitType(null==checkModel.getVisitType()?0:checkModel.getVisitType());
	151	+ setTeethCount(null);
	152	+ setRefertoOrgName(null);
	153	+ setCariesCount(null);
	154	+ setVitamindName(null);
	155	+ setHgb(null);
	156	+ }
	157	+
	158	+ public Integer getIsAppCreate() {
	159	+ return isAppCreate;
	160	+ }
	161	+
	162	+ public void setIsAppCreate(Integer isAppCreate) {
	163	+ this.isAppCreate = isAppCreate;
	164	+ }
	165	+
	166	+ public String getFollowupVisitDate() {
	167	+ return followupVisitDate;
	168	+ }
	169	+
	170	+ public void setFollowupVisitDate(String followupVisitDate) {
	171	+ this.followupVisitDate = followupVisitDate;
	172	+ }
	173	+
	174	+ public String getStandard() {
	175	+ return standard;
	176	+ }
	177	+
	178	+ public void setStandard(String standard) {
	179	+ this.standard = standard;
	180	+ }
	181	+
	182	+ public String getFollowupDoctorId() {
	183	+ return followupDoctorId;
	184	+ }
	185	+
	186	+ public void setFollowupDoctorId(String followupDoctorId) {
	187	+ this.followupDoctorId = followupDoctorId;
	188	+ }
	189	+
	190	+ public String getFollowupVisitDoctorName() {
	191	+ return followupVisitDoctorName;
	192	+ }
	193	+
	194	+ public void setFollowupVisitDoctorName(String followupVisitDoctorName) {
	195	+ this.followupVisitDoctorName = followupVisitDoctorName;
	196	+ }
	197	+
	198	+ public String getAgeCode() {
	199	+ return ageCode;
	200	+ }
	201	+
	202	+ public void setAgeCode(String ageCode) {
	203	+ this.ageCode = ageCode;
	204	+ }
	205	+
	206	+ public String getWeightEvalCode() {
	207	+ return weightEvalCode;
	208	+ }
	209	+
	210	+ public void setWeightEvalCode(String weightEvalCode) {
	211	+ this.weightEvalCode = weightEvalCode;
	212	+ }
	213	+
	214	+ public String getSickVisitCode() {
	215	+ return sickVisitCode;
	216	+ }
	217	+
	218	+ public void setSickVisitCode(String sickVisitCode) {
	219	+ this.sickVisitCode = sickVisitCode;
	220	+ }
	221	+
	222	+ public String getPneumVisitTimes() {
	223	+ return pneumVisitTimes;
	224	+ }
	225	+
	226	+ public void setPneumVisitTimes(String pneumVisitTimes) {
	227	+ this.pneumVisitTimes = pneumVisitTimes;
	228	+ }
	229	+
	230	+ public String getEditMedicine() {
	231	+ return editMedicine;
	232	+ }
	233	+
	234	+ public void setEditMedicine(String editMedicine) {
	235	+ this.editMedicine = editMedicine;
	236	+ }
	237	+
	238	+ public String getDiarrheaVisitTimes() {
	239	+ return diarrheaVisitTimes;
	240	+ }
	241	+
	242	+ public void setDiarrheaVisitTimes(String diarrheaVisitTimes) {
	243	+ this.diarrheaVisitTimes = diarrheaVisitTimes;
	244	+ }
	245	+
	246	+ public String getTraumaVisitTimes() {
	247	+ return traumaVisitTimes;
	248	+ }
	249	+
	250	+ public void setTraumaVisitTimes(String traumaVisitTimes) {
	251	+ this.traumaVisitTimes = traumaVisitTimes;
	252	+ }
	253	+
	254	+ public String getOthersVisitDesc() {
	255	+ return othersVisitDesc;
	256	+ }
	257	+
	258	+ public void setOthersVisitDesc(String othersVisitDesc) {
	259	+ this.othersVisitDesc = othersVisitDesc;
	260	+ }
	261	+
	262	+ public String getChildHealthExam() {
	263	+ return childHealthExam;
	264	+ }
	265	+
	266	+ public void setChildHealthExam(String childHealthExam) {
	267	+ this.childHealthExam = childHealthExam;
	268	+ }
	269	+
	270	+ public String getReferralContacts() {
	271	+ return referralContacts;
	272	+ }
	273	+
	274	+ public void setReferralContacts(String referralContacts) {
	275	+ this.referralContacts = referralContacts;
	276	+ }
	277	+
	278	+ public String getKinderGartenName() {
	279	+ return kinderGartenName;
	280	+ }
	281	+
	282	+ public void setKinderGartenName(String kinderGartenName) {
	283	+ this.kinderGartenName = kinderGartenName;
	284	+ }
	285	+
	286	+ public String getHealthManagementName() {
	287	+ return healthManagementName;
	288	+ }
	289	+
	290	+ public void setHealthManagementName(String healthManagementName) {
	291	+ this.healthManagementName = healthManagementName;
	292	+ }
	293	+
	294	+ public String getHealthManagementTel() {
	295	+ return healthManagementTel;
	296	+ }
	297	+
	298	+ public void setHealthManagementTel(String healthManagementTel) {
	299	+ this.healthManagementTel = healthManagementTel;
	300	+ }
	301	+
	302	+ public String getCheckOrgCode() {
	303	+ return checkOrgCode;
	304	+ }
	305	+
	306	+ public void setCheckOrgCode(String checkOrgCode) {
	307	+ this.checkOrgCode = checkOrgCode;
	308	+ }
	309	+
	310	+ public String getCheckOrgValue() {
	311	+ return checkOrgValue;
	312	+ }
	313	+
	314	+ public void setCheckOrgValue(String checkOrgValue) {
	315	+ this.checkOrgValue = checkOrgValue;
	316	+ }
	317	+
	318	+ public String getReferralResultCode() {
	319	+ return referralResultCode;
	320	+ }
	321	+
	322	+ public void setReferralResultCode(String referralResultCode) {
	323	+ this.referralResultCode = referralResultCode;
	324	+ }
	325	+
	326	+ public String getReferralTel() {
	327	+ return referralTel;
	328	+ }
	329	+
	330	+ public void setReferralTel(String referralTel) {
	331	+ this.referralTel = referralTel;
	332	+ }
	333	+
	334	+ public String getSkinAbnormCode() {
	335	+ return skinAbnormCode;
	336	+ }
	337	+
	338	+ public void setSkinAbnormCode(String skinAbnormCode) {
	339	+ this.skinAbnormCode = skinAbnormCode;
	340	+ }
	341	+
	342	+ public String getBregmaCloseCode() {
	343	+ return bregmaCloseCode;
	344	+ }
	345	+
	346	+ public void setBregmaCloseCode(String bregmaCloseCode) {
	347	+ this.bregmaCloseCode = bregmaCloseCode;
	348	+ }
	349	+
	350	+ public String getEyeAbnormCode() {
	351	+ return eyeAbnormCode;
	352	+ }
	353	+
	354	+ public void setEyeAbnormCode(String eyeAbnormCode) {
	355	+ this.eyeAbnormCode = eyeAbnormCode;
	356	+ }
	357	+
	358	+ public String getNeckMassCode() {
	359	+ return neckMassCode;
	360	+ }
	361	+
	362	+ public void setNeckMassCode(String neckMassCode) {
	363	+ this.neckMassCode = neckMassCode;
	364	+ }
	365	+
	366	+ public String getPhysicalDevelopEvalCode() {
	367	+ return physicalDevelopEvalCode;
	368	+ }
	369	+
	370	+ public void setPhysicalDevelopEvalCode(String physicalDevelopEvalCode) {
	371	+ this.physicalDevelopEvalCode = physicalDevelopEvalCode;
	372	+ }
	373	+
	374	+ public String getLungAbnormCode() {
	375	+ return lungAbnormCode;
	376	+ }
	377	+
	378	+ public void setLungAbnormCode(String lungAbnormCode) {
	379	+ this.lungAbnormCode = lungAbnormCode;
	380	+ }
	381	+
	382	+ public String getWeightDivHeight() {
	383	+ return weightDivHeight;
	384	+ }
	385	+
	386	+ public void setWeightDivHeight(String weightDivHeight) {
	387	+ this.weightDivHeight = weightDivHeight;
	388	+ }
	389	+
	390	+ public String getWeightDivHeightEvalCode() {
	391	+ return weightDivHeightEvalCode;
	392	+ }
	393	+
	394	+ public void setWeightDivHeightEvalCode(String weightDivHeightEvalCode) {
	395	+ this.weightDivHeightEvalCode = weightDivHeightEvalCode;
	396	+ }
	397	+
	398	+ public String getChildComplexionCode() {
	399	+ return childComplexionCode;
	400	+ }
	401	+
	402	+ public void setChildComplexionCode(String childComplexionCode) {
	403	+ this.childComplexionCode = childComplexionCode;
	404	+ }
	405	+
	406	+ public String getHeightEvalCode() {
	407	+ return heightEvalCode;
	408	+ }
	409	+
	410	+ public void setHeightEvalCode(String heightEvalCode) {
	411	+ this.heightEvalCode = heightEvalCode;
	412	+ }
	413	+
	414	+ public String getHearingScreenResultCode() {
	415	+ return hearingScreenResultCode;
	416	+ }
	417	+
	418	+ public void setHearingScreenResultCode(String hearingScreenResultCode) {
	419	+ this.hearingScreenResultCode = hearingScreenResultCode;
	420	+ }
	421	+
	422	+ public String getAbdomenAbnormCode() {
	423	+ return abdomenAbnormCode;
	424	+ }
	425	+
	426	+ public void setAbdomenAbnormCode(String abdomenAbnormCode) {
	427	+ this.abdomenAbnormCode = abdomenAbnormCode;
	428	+ }
	429	+
	430	+ public String getLimbsAbnormCode() {
	431	+ return limbsAbnormCode;
	432	+ }
	433	+
	434	+ public void setLimbsAbnormCode(String limbsAbnormCode) {
	435	+ this.limbsAbnormCode = limbsAbnormCode;
	436	+ }
	437	+
	438	+ public String getOralAbnormCode() {
	439	+ return oralAbnormCode;
	440	+ }
	441	+
	442	+ public void setOralAbnormCode(String oralAbnormCode) {
	443	+ this.oralAbnormCode = oralAbnormCode;
	444	+ }
	445	+
	446	+ public String getHeartAbnormCode() {
	447	+ return heartAbnormCode;
	448	+ }
	449	+
	450	+ public void setHeartAbnormCode(String heartAbnormCode) {
	451	+ this.heartAbnormCode = heartAbnormCode;
	452	+ }
	453	+
	454	+ public String getAnusAbnormCode() {
	455	+ return anusAbnormCode;
	456	+ }
	457	+
	458	+ public void setAnusAbnormCode(String anusAbnormCode) {
	459	+ this.anusAbnormCode = anusAbnormCode;
	460	+ }
	461	+
	462	+ public String getGaitAbnormCode() {
	463	+ return gaitAbnormCode;
	464	+ }
	465	+
	466	+ public void setGaitAbnormCode(String gaitAbnormCode) {
	467	+ this.gaitAbnormCode = gaitAbnormCode;
	468	+ }
	469	+
	470	+ public String getEarAbnormCode() {
	471	+ return earAbnormCode;
	472	+ }
	473	+
	474	+ public void setEarAbnormCode(String earAbnormCode) {
	475	+ this.earAbnormCode = earAbnormCode;
	476	+ }
	477	+
	478	+ public String getDevelopPassCode() {
	479	+ return developPassCode;
	480	+ }
	481	+
	482	+ public void setDevelopPassCode(String developPassCode) {
	483	+ this.developPassCode = developPassCode;
	484	+ }
	485	+
	486	+ public String getReferralCode() {
	487	+ return referralCode;
	488	+ }
	489	+
	490	+ public void setReferralCode(String referralCode) {
	491	+ this.referralCode = referralCode;
	492	+ }
	493	+
	494	+ public String getReferralReason() {
	495	+ return referralReason;
	496	+ }
	497	+
	498	+ public void setReferralReason(String referralReason) {
	499	+ this.referralReason = referralReason;
	500	+ }
	501	+
	502	+ public Object getMidicine() {
	503	+ return midicine;
	504	+ }
	505	+
	506	+ public void setMidicine(Object midicine) {
	507	+ this.midicine = midicine;
	508	+ }
	509	+
	510	+ public List<Object> getRecordChoice() {
	511	+ return recordChoice;
	512	+ }
	513	+
	514	+ public void setRecordChoice(List<Object> recordChoice) {
	515	+ this.recordChoice = recordChoice;
	516	+ }
	517	+
	518	+ public String getNextVisitTypeCode() {
	519	+ return nextVisitTypeCode;
	520	+ }
	521	+
	522	+ public void setNextVisitTypeCode(String nextVisitTypeCode) {
	523	+ this.nextVisitTypeCode = nextVisitTypeCode;
	524	+ }
	525	+
	526	+ public String getWeight() {
	527	+ return weight;
	528	+ }
	529	+
	530	+ public void setWeight(String weight) {
	531	+ this.weight = weight;
	532	+ }
	533	+
	534	+ public String getHeight() {
	535	+ return height;
	536	+ }
	537	+
	538	+ public void setHeight(String height) {
	539	+ this.height = height;
	540	+ }
	541	+
	542	+ public String getHeadCircumference() {
	543	+ return headCircumference;
	544	+ }
	545	+
	546	+ public void setHeadCircumference(String headCircumference) {
	547	+ this.headCircumference = headCircumference;
	548	+ }
	549	+
	550	+ public String getBregmaHorizDiameter() {
	551	+ return bregmaHorizDiameter;
	552	+ }
	553	+
	554	+ public void setBregmaHorizDiameter(String bregmaHorizDiameter) {
	555	+ this.bregmaHorizDiameter = bregmaHorizDiameter;
	556	+ }
	557	+
	558	+ public String getBregmaVertDiameter() {
	559	+ return bregmaVertDiameter;
	560	+ }
	561	+
	562	+ public void setBregmaVertDiameter(String bregmaVertDiameter) {
	563	+ this.bregmaVertDiameter = bregmaVertDiameter;
	564	+ }
	565	+
	566	+ public String getUmbcordFallCode() {
	567	+ return umbcordFallCode;
	568	+ }
	569	+
	570	+ public void setUmbcordFallCode(String umbcordFallCode) {
	571	+ this.umbcordFallCode = umbcordFallCode;
	572	+ }
	573	+
	574	+ public String getOutdoorActHours() {
	575	+ return outdoorActHours;
	576	+ }
	577	+
	578	+ public void setOutdoorActHours(String outdoorActHours) {
	579	+ this.outdoorActHours = outdoorActHours;
	580	+ }
	581	+
	582	+ public String getVitamindDose() {
	583	+ return vitamindDose;
	584	+ }
	585	+
	586	+ public void setVitamindDose(String vitamindDose) {
	587	+ this.vitamindDose = vitamindDose;
	588	+ }
	589	+
	590	+ public String getNextFollowupDate() {
	591	+ return nextFollowupDate;
	592	+ }
	593	+
	594	+ public void setNextFollowupDate(String nextFollowupDate) {
	595	+ this.nextFollowupDate = nextFollowupDate;
	596	+ }
	597	+
	598	+ public String getNewbornName() {
	599	+ return newbornName;
	600	+ }
	601	+
	602	+ public void setNewbornName(String newbornName) {
	603	+ this.newbornName = newbornName;
	604	+ }
	605	+
	606	+ public String getChildHealthExamFormNo() {
	607	+ return childHealthExamFormNo;
	608	+ }
	609	+
	610	+ public void setChildHealthExamFormNo(String childHealthExamFormNo) {
	611	+ this.childHealthExamFormNo = childHealthExamFormNo;
	612	+ }
	613	+
	614	+ public String getPersonInfoId() {
	615	+ return personInfoId;
	616	+ }
	617	+
	618	+ public void setPersonInfoId(String personInfoId) {
	619	+ this.personInfoId = personInfoId;
	620	+ }
	621	+
	622	+ public Integer getVisitType() {
	623	+ return visitType;
	624	+ }
	625	+
	626	+ public void setVisitType(Integer visitType) {
	627	+ this.visitType = visitType;
	628	+ }
	629	+
	630	+ public Integer getTeethCount() {
	631	+ return teethCount;
	632	+ }
	633	+
	634	+ public void setTeethCount(Integer teethCount) {
	635	+ this.teethCount = teethCount;
	636	+ }
	637	+
	638	+ public String getRefertoOrgName() {
	639	+ return refertoOrgName;
	640	+ }
	641	+
	642	+ public void setRefertoOrgName(String refertoOrgName) {
	643	+ this.refertoOrgName = refertoOrgName;
	644	+ }
	645	+
	646	+ public Integer getCariesCount() {
	647	+ return cariesCount;
	648	+ }
	649	+
	650	+ public void setCariesCount(Integer cariesCount) {
	651	+ this.cariesCount = cariesCount;
	652	+ }
	653	+
	654	+ public String getVitamindName() {
	655	+ return vitamindName;
	656	+ }
	657	+
	658	+ public void setVitamindName(String vitamindName) {
	659	+ this.vitamindName = vitamindName;
	660	+ }
	661	+
	662	+ public String getHgb() {
	663	+ return hgb;
	664	+ }
	665	+
	666	+ public void setHgb(String hgb) {
	667	+ this.hgb = hgb;
	668	+ }
	669	+}

...	...	@@ -99,7 +99,7 @@
99	99	setGuardianAddress(null);
100	100	setRespondent(null);
101	101	setInvestigateDate(null);
102		- setPersonInfoId(babyModel.getId());
	102	+ setPersonInfoId(StringUtils.isEmpty(babyModel.getId())?"无":babyModel.getId());
103	103	}
104	104
105	105	public List<Object> getRecordChoice() {

...	...	@@ -34,18 +34,18 @@
34	34	Public2PathFacade public2PathFacade;
35	35
36	36	/**
37		- * 公卫2.0-新增儿童健康检查
	37	+ * 公卫2.0-新增儿童花名册
38	38	* @param startDate
39	39	* @param endDate
40	40	* @param hospitalId
41	41	*/
42	42	@ResponseBody
43	43	@TokenRequired
44		- @RequestMapping(value = "/saveChildHealthExam", method = RequestMethod.GET)
45		- public BaseResponse saveChildHealthExam(@RequestParam String startDate,
	44	+ @RequestMapping(value = "/saveChildInfo", method = RequestMethod.GET)
	45	+ public BaseResponse saveChildInfo(@RequestParam String startDate,
46	46	@RequestParam String endDate,
47	47	@RequestParam String hospitalId) {
48		- BaseResponse baseResponse=public2PathFacade.saveChildHealthExam(startDate,endDate,hospitalId);
	48	+ BaseResponse baseResponse=public2PathFacade.saveChildInfo(startDate,endDate,hospitalId);
49	49	return baseResponse;
50	50	}
51	51	/**
...	...	@@ -61,6 +61,21 @@
61	61	@RequestParam String endDate,
62	62	@RequestParam String hospitalId) {
63	63	BaseResponse baseResponse=public2PathFacade.saveChildHomeVisit(startDate,endDate,hospitalId);
	64	+ return baseResponse;
	65	+ }
	66	+ /**
	67	+ * 公卫2.0-新增儿童健康检查
	68	+ * @param startDate
	69	+ * @param endDate
	70	+ * @param hospitalId
	71	+ */
	72	+ @ResponseBody
	73	+ @TokenRequired
	74	+ @RequestMapping(value = "/saveChildHealthExam", method = RequestMethod.GET)
	75	+ public BaseResponse saveChildHealthExam(@RequestParam String startDate,
	76	+ @RequestParam String endDate,
	77	+ @RequestParam String hospitalId) {
	78	+ BaseResponse baseResponse=public2PathFacade.saveChildHealthExam(startDate,endDate,hospitalId);
64	79	return baseResponse;
65	80	}
66	81

...	...	@@ -2878,6 +2878,7 @@
2878	2878	model.setFollowupVisitDoctorName(checkModel.getFollowupVisitDoctorName());
2879	2879	model.setChildHealthExamFormNo(checkModel.getChildHealthExamFormNo());
2880	2880	model.setVisitType(checkModel.getVisitType());
	2881	+ model.setRecordChoice(checkModel.getRecordChoice());
2881	2882	return model;
2882	2883
2883	2884	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.alibaba.fastjson.JSON;
4		-import com.lyms.hospitalapi.lhxfy.model.SaveChildHomeVisitInfo;
5		-import com.lyms.hospitalapi.lhxfy.model.SaveChildInfo;
6		-import com.lyms.hospitalapi.lhxfy.model.UploadResult;
7		-import com.lyms.hospitalapi.lhxfy.model.UploadResult_Public2;
	4	+import com.lyms.hospitalapi.lhxfy.model.*;
8	5	import com.lyms.platform.biz.service.BabyBookbuildingService;
	6	+import com.lyms.platform.biz.service.BabyCheckService;
9	7	import com.lyms.platform.biz.service.BabyService;
10	8	import com.lyms.platform.common.enums.YnEnums;
11	9	import com.lyms.platform.common.result.BaseObjectResponse;
12	10	import com.lyms.platform.common.result.BaseResponse;
13	11	import com.lyms.platform.common.utils.*;
14	12	import com.lyms.platform.operate.web.utils.CollectionUtils;
	13	+import com.lyms.platform.pojo.BabyCheckModel;
15	14	import com.lyms.platform.pojo.BabyModel;
16	15	import com.lyms.platform.pojo.NewbornVisit;
	16	+import com.lyms.platform.query.BabyCheckModelQuery;
17	17	import com.lyms.platform.query.BabyModelQuery;
18	18	import jxl.common.BaseUnit;
19	19	import org.apache.poi.ss.formula.functions.T;
20	20
21	21
22	22
23	23
24	24
25	25
26	26
...	...	@@ -37,43 +37,45 @@
37	37	private MongoTemplate mongoTemplate;
38	38	@Autowired
39	39	BabyBookbuildingService babyBookbuildingService;
	40	+ @Autowired
	41	+ BabyCheckService babyCheckService;
40	42
41		- private static final String URL = "http://222.223.187.132:7076/ph-s-report/";
42		- public BaseResponse saveChildHealthExam(String startDate, String endDate,String hospitalId) {
	43	+ private static final String URL = "http://222.223.187.132:7076/ph-s-report";
	44	+ public BaseResponse saveChildInfo(String startDate, String endDate,String hospitalId) {
43	45	BaseResponse baseResponse=new BaseResponse();
44	46	List<String> baseResponseList=new ArrayList<>();//记录错误信息
45		- BabyModelQuery babyModelQuery=new BabyModelQuery();
46		- babyModelQuery.setYn(YnEnums.YES.getId());
47		- babyModelQuery.setHospitalId(hospitalId);
48		- babyModelQuery.setBuildDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
49		- babyModelQuery.setBuildDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
50		- List<BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
51		- String urladd=URL+"thirdApi/saveChildHealthExam/v1";//新增上传
52		- for (BabyModel model : babyModelList) {
	47	+ BabyModelQuery modelQuery=new BabyModelQuery();
	48	+ modelQuery.setYn(YnEnums.YES.getId());
	49	+ modelQuery.setHospitalId(hospitalId);
	50	+ modelQuery.setBuildDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
	51	+ modelQuery.setBuildDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
	52	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(modelQuery);
	53	+ String urladd=URL+"/thirdApi/saveChildInfo/v1";//新增上传
	54	+ for (BabyModel model : models) {
53	55	try {
54	56	//数据转换
55		- SaveChildInfo saveChildInfo=new SaveChildInfo();
56		- saveChildInfo.convertToDataModel(model);
57		- String jsonString = JSON.toJSONString(saveChildInfo);
	57	+ SaveChildInfo modelInfo=new SaveChildInfo();
	58	+ modelInfo.convertToDataModel(model);
	59	+ String jsonString = JSON.toJSONString(modelInfo);
58	60	//上传数据
59	61	String result=repeatPost(urladd,jsonString);
60	62	if(StringUtils.isNotEmpty(result)){
61	63	List<UploadResult_Public2> results=JsonUtil.jsonToList(result, UploadResult.class);
62	64	if("0".equals(results.get(0).getCode())){
63		- baseResponseList.add("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
64		- LogUtil.taskInfo("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
	65	+ baseResponseList.add("新增儿童花名册---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
	66	+ LogUtil.taskInfo("新增儿童花名册---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
65	67	}else {
66		- baseResponseList.add("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
67		- LogUtil.error("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage(),null);
	68	+ baseResponseList.add("新增儿童花名册---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
	69	+ LogUtil.error("新增儿童花名册---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage(),null);
68	70	}
69	71	}else {
70		- baseResponseList.add("新增儿童健康检查---"+model.getId()+"---上传返回结果为null");
71		- LogUtil.error("新增儿童健康检查---"+model.getId()+"---上传返回结果为null",null);
	72	+ baseResponseList.add("新增儿童花名册---"+model.getId()+"---上传返回结果为null");
	73	+ LogUtil.error("新增儿童花名册---"+model.getId()+"---上传返回结果为null",null);
72	74	}
73	75	} catch (Exception e) {
74	76	e.printStackTrace();
75		- LogUtil.error("新增儿童健康检查---"+model.getId()+"---"+e.getMessage(),null);
76		- baseResponse.setErrormsg("新增儿童健康检查---"+model.getId()+"---"+e.getMessage());
	77	+ LogUtil.error("新增儿童花名册---"+model.getId()+"---"+e.getMessage(),null);
	78	+ baseResponse.setErrormsg("新增儿童花名册---"+model.getId()+"---"+e.getMessage());
77	79	}
78	80	}
79	81	baseResponse.setObject(baseResponseList);
80	82
...	...	@@ -111,14 +113,14 @@
111	113	.gte(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)))
112	114	.lte(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate))));
113	115
114		- List<NewbornVisit> newbornVisits = mongoTemplate.find(query, NewbornVisit.class);
115		- String urladd=URL+"thirdApi/saveChildHealthExam/v1";//新增上传
116		- for (NewbornVisit model : newbornVisits) {
	116	+ List<NewbornVisit> models = mongoTemplate.find(query, NewbornVisit.class);
	117	+ String urladd=URL+"/thirdApi/saveChildHomeVisit/v1";//新增上传
	118	+ for (NewbornVisit model : models) {
117	119	try {
118	120	//数据转换
119		- SaveChildHomeVisitInfo saveChildHomeVisitInfo=new SaveChildHomeVisitInfo();
120		- saveChildHomeVisitInfo.convertToDataModel(model);
121		- String jsonString = JSON.toJSONString(saveChildHomeVisitInfo);
	121	+ SaveChildHomeVisitInfo modelInfo=new SaveChildHomeVisitInfo();
	122	+ modelInfo.convertToDataModel(model);
	123	+ String jsonString = JSON.toJSONString(modelInfo);
122	124	//上传数据
123	125	String result=repeatPost(urladd,jsonString);
124	126	if(StringUtils.isNotEmpty(result)){
...	...	@@ -138,6 +140,47 @@
138	140	e.printStackTrace();
139	141	LogUtil.error("新增新生儿家庭访视---"+model.getId()+"---"+e.getMessage(),null);
140	142	baseResponse.setErrormsg("新增新生儿家庭访视---"+model.getId()+"---"+e.getMessage());
	143	+ }
	144	+ }
	145	+ baseResponse.setObject(baseResponseList);
	146	+ return baseResponse;
	147	+ }
	148	+
	149	+ public BaseResponse saveChildHealthExam(String startDate, String endDate, String hospitalId) {
	150	+ BaseResponse baseResponse=new BaseResponse();
	151	+ List<String> baseResponseList=new ArrayList<>();//记录错误信息
	152	+ BabyCheckModelQuery modelQuery=new BabyCheckModelQuery();
	153	+ modelQuery.setYn(YnEnums.YES.getId());
	154	+ modelQuery.setHospitalId(hospitalId);
	155	+ modelQuery.setCheckDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
	156	+ modelQuery.setCheckDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
	157	+ List<BabyCheckModel> models = babyCheckService.queryBabyCheckRecord(modelQuery);
	158	+ String urladd=URL+"/thirdApi/saveChildHealthExam/v1";//新增上传
	159	+ for (BabyCheckModel model : models) {
	160	+ try {
	161	+ //数据转换
	162	+ SaveChildHealthExamInfo modelInfo=new SaveChildHealthExamInfo();
	163	+ modelInfo.convertToDataModel(model);
	164	+ String jsonString = JSON.toJSONString(modelInfo);
	165	+ //上传数据
	166	+ String result=repeatPost(urladd,jsonString);
	167	+ if(StringUtils.isNotEmpty(result)){
	168	+ List<UploadResult_Public2> results=JsonUtil.jsonToList(result, UploadResult.class);
	169	+ if("0".equals(results.get(0).getCode())){
	170	+ baseResponseList.add("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
	171	+ LogUtil.taskInfo("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
	172	+ }else {
	173	+ baseResponseList.add("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage());
	174	+ LogUtil.error("新增儿童健康检查---"+model.getId()+"---code:"+results.get(0).getCode()+"message:"+results.get(0).getMessage(),null);
	175	+ }
	176	+ }else {
	177	+ baseResponseList.add("新增儿童健康检查---"+model.getId()+"---上传返回结果为null");
	178	+ LogUtil.error("新增儿童健康检查---"+model.getId()+"---上传返回结果为null",null);
	179	+ }
	180	+ } catch (Exception e) {
	181	+ e.printStackTrace();
	182	+ LogUtil.error("新增儿童健康检查---"+model.getId()+"---"+e.getMessage(),null);
	183	+ baseResponse.setErrormsg("新增儿童健康检查---"+model.getId()+"---"+e.getMessage());
141	184	}
142	185	}
143	186	baseResponse.setObject(baseResponseList);

...	...	@@ -726,7 +726,7 @@
726	726	//儿童健康检查表单编号
727	727	private String childHealthExamFormNo;
728	728	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
729		- private String visitType;
	729	+ private Integer visitType;
730	730	//选项指标记录
731	731	private List<Object> recordChoice;
732	732
733	733
734	734
...	...	@@ -786,13 +786,14 @@
786	786	this.childHealthExamFormNo = childHealthExamFormNo;
787	787	}
788	788
789		- public String getVisitType() {
	789	+ public Integer getVisitType() {
790	790	return visitType;
791	791	}
792	792
793		- public void setVisitType(String visitType) {
	793	+ public void setVisitType(Integer visitType) {
794	794	this.visitType = visitType;
795	795	}
	796	+
796	797	public String getSf() {
797	798	return sf;
798	799	}

...	...	@@ -990,7 +990,7 @@
990	990	//儿童健康检查表单编号
991	991	private String childHealthExamFormNo;
992	992	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
993		- private String visitType;
	993	+ private Integer visitType;
994	994	//选项指标记录
995	995	private List<Object> recordChoice;
996	996
997	997
...	...	@@ -1050,11 +1050,11 @@
1050	1050	this.childHealthExamFormNo = childHealthExamFormNo;
1051	1051	}
1052	1052
1053		- public String getVisitType() {
	1053	+ public Integer getVisitType() {
1054	1054	return visitType;
1055	1055	}
1056	1056
1057		- public void setVisitType(String visitType) {
	1057	+ public void setVisitType(Integer visitType) {
1058	1058	this.visitType = visitType;
1059	1059	}
1060	1060

...	...	@@ -55,7 +55,9 @@
55	55	//儿童健康检查表单编号
56	56	private String childHealthExamFormNo;
57	57	//儿童随访类型 1.新生儿家庭访视，2.一岁以内随访，3.1~2岁随访，4.3~6岁随访
58		- private String visitType;
	58	+ private Integer visitType;
	59	+ //选项指标记录
	60	+ private List<Object> recordChoice;
59	61
60	62	public Integer getIsAppCreate() {
61	63	return isAppCreate;
62	64
63	65
...	...	@@ -105,12 +107,20 @@
105	107	this.childHealthExamFormNo = childHealthExamFormNo;
106	108	}
107	109
108		- public String getVisitType() {
	110	+ public Integer getVisitType() {
109	111	return visitType;
110	112	}
111	113
112		- public void setVisitType(String visitType) {
	114	+ public void setVisitType(Integer visitType) {
113	115	this.visitType = visitType;
	116	+ }
	117	+
	118	+ public List<Object> getRecordChoice() {
	119	+ return recordChoice;
	120	+ }
	121	+
	122	+ public void setRecordChoice(List<Object> recordChoice) {
	123	+ this.recordChoice = recordChoice;
114	124	}
115	125
116	126	public String getEljy() {