jiangjiazhi / regional-platform

Commit a7b52f73007c92b906f4bcbea69197b86bbc8b28

Authored by litao@lymsh.com over 7 years ago

1 parent 3981936316

Exists in master and in 6 other branches

改字段

Showing 5 changed files with 59 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

...	...	@@ -17,6 +17,15 @@
17	17	public class AntenatalExaminationModel extends BaseModel {
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid();
	20	+ List<String> mHighRiskReason;
	21	+
	22	+ public List<String> getmHighRiskReason() {
	23	+ return mHighRiskReason;
	24	+ }
	25	+
	26	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	27	+ this.mHighRiskReason = mHighRiskReason;
	28	+ }
20	29
21	30	/** 处理意见 */
22	31	private Map<String, List<String>> treatmentOpinion2;

...	...	@@ -1965,6 +1965,7 @@
1965	1965	map.put("diagnosis", diagnosis);
1966	1966	map.put("treatmentOpinion", data.getTreatmentOpinion());
1967	1967	map.put("guide", data.getGuide());
	1968	+ map.put("mHighRiskReason", mongoUtil.findPlatValueList(data.getmHighRiskReason()));
1968	1969
1969	1970	/** 优惠券编号 */
1970	1971	map.put("couponCode", couponService.findByUsedId(id));

...	...	@@ -15,6 +15,15 @@
15	15	*/
16	16	@Form
17	17	public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminationModel> {
	18	+ List<String> mHighRiskReason;
	19	+
	20	+ public List<String> getmHighRiskReason() {
	21	+ return mHighRiskReason;
	22	+ }
	23	+
	24	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	25	+ this.mHighRiskReason = mHighRiskReason;
	26	+ }
18	27	/** 处理意见 */
19	28	private Map<String, List<String>> treatmentOpinion2;
20	29	private List<String> treatmentOpinion2Types;
...	...	@@ -298,6 +307,7 @@
298	307	@Override
299	308	public AntenatalExaminationModel convertToDataModel() {
300	309	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
	310	+ examinationModel.setmHighRiskReason(mHighRiskReason);
301	311	examinationModel.setQuicken(quicken);
302	312	examinationModel.setQuickenRemark(quickenRemark);
303	313	examinationModel.setTreatmentOpinion2(treatmentOpinion2);

...	...	@@ -20,6 +20,16 @@
20	20	@Form
21	21	public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
22	22
	23	+ List<String> mHighRiskReason;
	24	+
	25	+ public List<String> getmHighRiskReason() {
	26	+ return mHighRiskReason;
	27	+ }
	28	+
	29	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	30	+ this.mHighRiskReason = mHighRiskReason;
	31	+ }
	32	+
23	33	private Map<String, List<String>> treatmentOpinion2;
24	34	private List<String> treatmentOpinion2Types;
25	35	/** 胎动 */

...	...	@@ -123,6 +123,7 @@
123	123	}
124	124	}
125	125	}
	126	+
126	127	StringBuilder refractometer = new StringBuilder();
127	128	if(StringUtils.isNotEmpty(babyEyeCheck.getR1())) {
128	129	refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append( " )");
129	130
...	...	@@ -149,8 +150,35 @@
149	150	}
150	151	refractometer.append("L:DC( ").append(babyEyeCheck.getL2()).append( " )");
151	152	}
152		-
153	153	map.put("refractometer", refractometer.toString());
	154	+
	155	+ StringBuilder refraction = new StringBuilder();
	156	+ if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1())) {
	157	+ refraction.append("R:S( ").append(babyEyeCheck.getRefractionR1()).append( " )");
	158	+ }
	159	+ if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) {
	160	+ if(refraction.length() != 0) {
	161	+ refraction.append(" ");
	162	+ }
	163	+ refraction.append("R:DC( ").append(babyEyeCheck.getRefractionR2()).append( " )");
	164	+ }
	165	+ boolean flag2 = false;
	166	+ if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL1())) {
	167	+ if(refraction.length() != 0) {
	168	+ refraction.append(", ");
	169	+ flag2 = true;
	170	+ }
	171	+ refraction.append("L:S( ").append(babyEyeCheck.getRefractionL1()).append( " ) ");
	172	+ }
	173	+ if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL2())) {
	174	+ if(!flag2) {
	175	+ if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1()) \|\| StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) {
	176	+ refraction.append(", ");
	177	+ }
	178	+ }
	179	+ refraction.append("L:DC( ").append(babyEyeCheck.getRefractionL2()).append( " )");
	180	+ }
	181	+ map.put("refraction", refraction.toString());
154	182
155	183	map.put("riskFactorId", riskFactorNames);
156	184	map.put("checkMonthId", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId()));