Parcourir la source

Merge remote-tracking branch 'origin/cnbg-master' into cnbg-master

shc il y a 1 an
Parent
commit
bd013086b3

+ 6 - 6
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -397,7 +397,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 		// 政策信息收集/竞品信息收集/库存信息收集/药物警戒相关信息收集(疗效等)/专家咨询
 		if ("12".equals(wmTaskContent.getTemp30())
 				|| "13".equals(wmTaskContent.getTemp30())
-				|| "14".equals(wmTaskContent.getTemp30())
+				// || "14".equals(wmTaskContent.getTemp30())
 				|| "17".equals(wmTaskContent.getTemp30())
 				|| "21".equals(wmTaskContent.getTemp30())) {
 
@@ -410,11 +410,11 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 				throw new RuntimeException("30天以前的任务无法提交");
 			}
 
-			if ("14".equals(wmTaskContent.getTemp30())) {
-				// 设置调查对象和调查品种
-				wmTaskContent.setTemp24(wmTaskContent.getTemp24label());
-				wmTaskContent.setTemp26(wmTaskContent.getTemp26label());
-			}
+			// if ("14".equals(wmTaskContent.getTemp30())) {
+			// 	// 设置调查对象和调查品种
+			// 	wmTaskContent.setTemp24(wmTaskContent.getTemp24label());
+			// 	wmTaskContent.setTemp26(wmTaskContent.getTemp26label());
+			// }
 		}
 
 		// 商业公司信息收集/医院信息收集