feat(service): 调查信息审核-药品信息化追溯体系字段转换

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmDaDistribution.java

@@ -214,9 +214,9 @@ public class WmDaDistribution extends Model<WmDaDistribution> {
 	private String sygsdz;
 
 	/**
-	 * 药品信息化追溯体系
+	 * 药品信息化追溯体系（0-扫码入库，1-其他）
 	 */
-	@ApiModelProperty(value = "药品信息化追溯体系")
+	@ApiModelProperty(value = "药品信息化追溯体系（0-扫码入库，1-其他）")
 	private String medicineTraceability;
 
 	/**
@@ -224,4 +224,47 @@ public class WmDaDistribution extends Model<WmDaDistribution> {
 	 */
 	@ApiModelProperty(value = "药品信息化追溯体系-其他")
 	private String medicineTraceabilityOther;
+
+	/**
+	 * 药品信息化追溯体系枚举类
+	 */
+	public enum MedicineTraceabilityEnum {
+		// 0-扫码入库，1-其他
+		SCAN_CODE("0", "扫码入库"),
+		OTHER("1", "其他"),
+		DEFAULT_NULL("", "");
+
+		private String val;
+
+		private String name;
+
+		MedicineTraceabilityEnum(String val, String name) {
+			this.val = val;
+			this.name = name;
+		}
+
+		public String getVal() {
+			return val;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+	}
+
+	/**
+	 * 药品信息化追溯体系枚举类转换
+	 *
+	 * @param val
+	 * @return
+	 */
+	public static MedicineTraceabilityEnum resolve(String val){
+		for (MedicineTraceabilityEnum medicineTraceabilityEnum: MedicineTraceabilityEnum.values()){
+			if (medicineTraceabilityEnum.val.equals(val)){
+				return medicineTraceabilityEnum;
+			}
+		}
+		return MedicineTraceabilityEnum.DEFAULT_NULL;
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDistributionServiceImpl.java

@@ -341,7 +341,8 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 			newinfo.setJyys(wmTaskContent.getTemp21());
 		}
 		if (null != wmTaskContent.getTemp22() && !wmTaskContent.getTemp22().equals(wmDaDistribution.getMedicineTraceability())) {
-			resList.add(generateMap("药品信息化追溯体系", wmDaDistribution.getMedicineTraceability(), wmTaskContent.getTemp22()));
+			resList.add(generateMap("药品信息化追溯体系", WmDaDistribution.resolve(wmDaDistribution.getMedicineTraceability()).getName(),
+					WmDaDistribution.resolve(wmTaskContent.getTemp22()).getName()));
 			newinfo.setMedicineTraceability(wmTaskContent.getTemp22());
 		}
 		if (null != wmTaskContent.getTemp25() && !wmTaskContent.getTemp25().equals(wmDaDistribution.getMedicineTraceabilityOther())) {