jiangjiazhi / regional-platform

Commit 79d4e8d29010d6a6bfaf579ea61c1ae87f1577ae

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 4 changed files with 64 additions and 46 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java

...	...	@@ -31,7 +31,7 @@
31	31	/**
32	32	* 分娩方式
33	33	*/
34		- private Integer parturitionType;
	34	+ private String parturitionType;
35	35
36	36	/**
37	37	* 出生缺陷类型: 1=有 -1=无
38	38
39	39
...	...	@@ -232,13 +232,15 @@
232	232	public void setBirthWeight(BigDecimal birthWeight) {
233	233	this.birthWeight = birthWeight;
234	234	}
235		- public Integer getParturitionType() {
	235	+
	236	+ public String getParturitionType() {
236	237	return parturitionType;
237	238	}
238	239
239		- public void setParturitionType(Integer parturitionType) {
	240	+ public void setParturitionType(String parturitionType) {
240	241	this.parturitionType = parturitionType;
241	242	}
	243	+
242	244	public Integer getBirthDefectType() {
243	245	return birthDefectType;
244	246	}

...	...	@@ -8,7 +8,7 @@
8	8	<result column="fetu_number" property="fetuNumber" jdbcType="INTEGER"/>
9	9	<result column="product_number" property="productNumber" jdbcType="INTEGER"/>
10	10	<result column="birth_weight" property="birthWeight" jdbcType="DOUBLE"/>
11		- <result column="parturition_type" property="parturitionType" jdbcType="INTEGER"/>
	11	+ <result column="parturition_type" property="parturitionType" jdbcType="VARCHAR"/>
12	12	<result column="birth_defect_type" property="birthDefectType" jdbcType="INTEGER"/>
13	13	<result column="birth_defect_desc" property="birthDefectDesc" jdbcType="VARCHAR"/>
14	14	<result column="fetu_embarras_type" property="fetuEmbarrasType" jdbcType="INTEGER"/>
...	...	@@ -64,8 +64,8 @@
64	64	<if test="birthWeight != null and birthWeight >= 0">
65	65	birth_weight = #{birthWeight,jdbcType=DOUBLE},
66	66	</if>
67		- <if test="parturitionType != null and parturitionType >= 0">
68		- parturition_type = #{parturitionType,jdbcType=INTEGER},
	67	+ <if test="parturitionType != null and parturitionType != ''">
	68	+ parturition_type = #{parturitionType,jdbcType=VARCHAR},
69	69	</if>
70	70	<if test="birthDefectType != null and birthDefectType >= 0">
71	71	birth_defect_type = #{birthDefectType,jdbcType=INTEGER},
...	...	@@ -208,8 +208,8 @@
208	208	<if test="birthWeight != null and birthWeight >= 0">
209	209	and birth_weight = #{birthWeight,jdbcType=DOUBLE}
210	210	</if>
211		- <if test="parturitionType != null and parturitionType >= 0">
212		- and parturition_type = #{parturitionType,jdbcType=INTEGER}
	211	+ <if test="parturitionType != null and parturitionType != ''">
	212	+ and parturition_type = #{parturitionType,jdbcType=VARCHAR}
213	213	</if>
214	214	<if test="birthDefectType != null and birthDefectType >= 0">
215	215	and birth_defect_type = #{birthDefectType,jdbcType=INTEGER}
...	...	@@ -238,7 +238,7 @@
238	238	<if test="amnioticFluidType != null and amnioticFluidType >= 0">
239	239	and amniotic_fluid_type = #{amnioticFluidType,jdbcType=INTEGER}
240	240	</if>
241		- <if test="abnormalParturitionType != null and abnormalParturitionType >= 0">
	241	+ <if test="abnormalParturitionType != null and abnormalParturitionType >=0">
242	242	and abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER}
243	243	</if>
244	244	<if test="abnormalParturitionPosition != null and abnormalParturitionPosition != ''">

...	...	@@ -685,16 +685,22 @@
685	685	int yesOrNo = historyJson.getIntValue("yesOrNo");
686	686	if (yesOrNo == 1) {
687	687	historyStr.append("有(");
688		- if (historyJson.containsKey("type")) {
689		- String type = historyJson.getString("type");
690		- if ("yinJiu".equals(type)) {
	688	+ if (historyJson.containsKey("yinJiu")) {
	689	+ boolean yinJiu = historyJson.getBoolean("yinJiu");
	690	+ if (yinJiu) {
691	691	historyStr.append("饮酒、");
692	692	}
693		- if ("xiYan".equals(type)) {
	693	+ }
	694	+ if (historyJson.containsKey("xiYan")) {
	695	+ boolean xiYan = historyJson.getBoolean("xiYan");
	696	+ if (xiYan) {
694	697	historyStr.append("吸烟、");
695	698	}
696		- if ("xiDu".equals(type)) {
697		- historyStr.append("吸毒");
	699	+ }
	700	+ if (historyJson.containsKey("xiDu")) {
	701	+ boolean xiDu = historyJson.getBoolean("xiDu");
	702	+ if (xiDu) {
	703	+ historyStr.append("吸毒、");
698	704	}
699	705	}
700	706	historyStr.append(")");
701	707
702	708
703	709
704	710
...	...	@@ -927,19 +933,25 @@
927	933	historyStr.append("无");
928	934	}
929	935	}
930		- if (historyJson.containsKey("type")) {
931		- String type = historyJson.getString("type");
932		- if ("yinJiu".equals(type)) {
	936	+ if (historyJson.containsKey("yinJiu")) {
	937	+ boolean yinJiu = historyJson.getBoolean("yinJiu");
	938	+ if (yinJiu) {
933	939	historyStr.append("饮酒、");
934	940	}
935		- if ("xiYan".equals(type)) {
	941	+ }
	942	+ if (historyJson.containsKey("xiYan")) {
	943	+ boolean xiYan = historyJson.getBoolean("xiYan");
	944	+ if (xiYan) {
936	945	historyStr.append("吸烟、");
937	946	}
938		- if ("xiDu".equals(type)) {
939		- historyStr.append("吸毒");
	947	+ }
	948	+ if (historyJson.containsKey("xiDu")) {
	949	+ boolean xiDu = historyJson.getBoolean("xiDu");
	950	+ if (xiDu) {
	951	+ historyStr.append("吸毒、");
940	952	}
941		- historyStr.append(")");
942	953	}
	954	+ historyStr.append(")");
943	955	babyEarMotherView.setBadLifeHistoryType(historyStr.toString());
944	956	}
945	957
946	958
...	...	@@ -956,10 +968,16 @@
956	968	}
957	969	}
958	970
	971	+ if (historyJson.containsKey("tnb")) {
	972	+ boolean sy = historyJson.getBooleanValue("tnb");
	973	+ if (sy) {
	974	+ historyStr.append("糖尿病、");
	975	+ }
	976	+ }
959	977	if (historyJson.containsKey("sy")) {
960	978	boolean sy = historyJson.getBooleanValue("sy");
961	979	if (sy) {
962		- historyStr.append("肾炎");
	980	+ historyStr.append("肾炎、");
963	981	}
964	982	}
965	983	if (historyJson.containsKey("jzxgnjt")) {
966	984
967	985
968	986
969	987
970	988
...	...	@@ -1039,21 +1057,20 @@
1039	1057	*/
1040	1058	public BabyEarBirthView convertToBabyEarBirthView(BabyPatientExtendEarBirth babyPatientExtendEarBirth) {
1041	1059	BabyEarBirthView babyEarBirthView = new BabyEarBirthView();
1042		- babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : babyPatientExtendEarBirth.getFetuNumber() + "");
1043		- babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "");
	1060	+ babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : babyPatientExtendEarBirth.getFetuNumber() + "次");
	1061	+ babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "次");
1044	1062	babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
1045		- babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "");
1046	1063	babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
1047	1064	if (babyPatientExtendEarBirth.getParturitionType() != null) {
1048		- String parturitionType = CZFmTypeEnums.getTitle(babyPatientExtendEarBirth.getParturitionType());
	1065	+ String parturitionType = FmTypeEnums.getIdByName(babyPatientExtendEarBirth.getParturitionType());
1049	1066	babyEarBirthView.setParturitionType(parturitionType);
1050	1067	}
1051		- if(babyPatientExtendEarBirth.getAmnioticFluidType()!=null){
1052		- if(babyPatientExtendEarBirth.getAmnioticFluidType() == 1){ //1= I度 2=II度 3=III度
	1068	+ if (babyPatientExtendEarBirth.getAmnioticFluidType() != null) {
	1069	+ if (babyPatientExtendEarBirth.getAmnioticFluidType() == 1) { //1= I度 2=II度 3=III度
1053	1070	babyEarBirthView.setAmnioticFluid("I度");
1054		- }else if(babyPatientExtendEarBirth.getAmnioticFluidType() == 2){ //1= I度 2=II度 3=III度
	1071	+ } else if (babyPatientExtendEarBirth.getAmnioticFluidType() == 2) { //1= I度 2=II度 3=III度
1055	1072	babyEarBirthView.setAmnioticFluid("II度");
1056		- }else if(babyPatientExtendEarBirth.getAmnioticFluidType() == 2){ //1= I度 2=II度 3=III度
	1073	+ } else if (babyPatientExtendEarBirth.getAmnioticFluidType() == 2) { //1= I度 2=II度 3=III度
1057	1074	babyEarBirthView.setAmnioticFluid("III度");
1058	1075	}
1059	1076	}
1060	1077
1061	1078
1062	1079
...	...	@@ -1066,22 +1083,22 @@
1066	1083	parturitType = "有(";
1067	1084	if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getAbnormalParturitionPosition())) {//异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破
1068	1085	JSONObject positionJo = JSONObject.parseObject(babyPatientExtendEarBirth.getAbnormalParturitionPosition());
1069		- if(positionJo.containsKey("tw")){
1070		- if(positionJo.getBoolean("tw")){
1071		- parturitType+="臀部、";
	1086	+ if (positionJo.containsKey("tw")) {
	1087	+ if (positionJo.getBoolean("tw")) {
	1088	+ parturitType += "臀部、";
1072	1089	}
1073	1090	}
1074		- if(positionJo.containsKey("qdrj")){
1075		- if(positionJo.getBoolean("qdrj")){
1076		- parturitType+="脐带绕颈、";
	1091	+ if (positionJo.containsKey("qdrj")) {
	1092	+ if (positionJo.getBoolean("qdrj")) {
	1093	+ parturitType += "脐带绕颈、";
1077	1094	}
1078	1095	}
1079		- if(positionJo.containsKey("tmzp")){
1080		- if(positionJo.getBoolean("tmzp")){
1081		- parturitType+="胎膜早破、";
	1096	+ if (positionJo.containsKey("tmzp")) {
	1097	+ if (positionJo.getBoolean("tmzp")) {
	1098	+ parturitType += "胎膜早破、";
1082	1099	}
1083	1100	}
1084		- parturitType+=")";
	1101	+ parturitType += ")";
1085	1102	// if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 1) {
1086	1103	// parturitType = "有(臀部)";
1087	1104	// } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 2) {
...	...	@@ -1576,7 +1593,7 @@
1576	1593	screenQuery.setCheckHospitalIds(checkHospitalIds);
1577	1594
1578	1595	//如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
1579		- if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord())\|\|earScreenListRequest.getBirthStartTime()!=null\|\|earScreenListRequest.getBirthEndTime()!=null) {//关键字：姓名、联系方式、就诊卡查询babyId
	1596	+ if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) \|\| earScreenListRequest.getBirthStartTime() != null \|\| earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡查询babyId
1580	1597	BabyModelQuery babyQuery = new BabyModelQuery();
1581	1598	babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
1582	1599	babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime());
1583	1600
...	...	@@ -1623,10 +1640,10 @@
1623	1640	screenResult.setHighRiskCause(hfBuff.toString());
1624	1641	}
1625	1642	String srcResult = "通过";
1626		- if ((earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1 )\|\| (earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1)) {
	1643	+ if ((earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1) \|\| (earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1)) {
1627	1644	srcResult = "不通过";
1628	1645	}
1629		- if ((earScreen.getOaeRight() != null && earScreen.getOaeRight() == -1)\|\| (earScreen.getAabrRight() != null && earScreen.getAabrRight() == -1)) {
	1646	+ if ((earScreen.getOaeRight() != null && earScreen.getOaeRight() == -1) \|\| (earScreen.getAabrRight() != null && earScreen.getAabrRight() == -1)) {
1630	1647	srcResult = "不通过";
1631	1648	}
1632	1649	screenResult.setSrcResult(srcResult);

...	...	@@ -4,7 +4,6 @@
4	4	import com.lyms.platform.common.utils.DateUtil;
5	5	import com.lyms.platform.pojo.BabyModel;
6	6
7		-import java.util.Date;
8	7	import java.util.List;
9	8
10	9	/**
...	...	@@ -183,7 +182,7 @@
183	182	babyModel.setServiceType(serviceType);
184	183	babyModel.setServiceStatus(serviceStatus);
185	184	babyModel.setBuildDoctor(createUserId);
186		- babyModel.setBuildDate(new Date());
	185	+ babyModel.setBuildDate(DateUtil.parseDate(createTime));
187	186	babyModel.setBirth(DateUtil.parseYMD(birth));
188	187	babyModel.setCardNo(cardNo);
189	188	babyModel.setName(name);