Browse Source

数据埋点和病历模板修改

wangfeng 6 years ago
parent
commit
dd7f3507d2

+ 55 - 0
icss-service/src/main/java/com/diagbot/facade/BuriedSomeStatisticalFacade.java

@@ -0,0 +1,55 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.diagbot.entity.BuriedSomeStatistical;
+import com.diagbot.service.impl.BuriedSomeStatisticalServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.BuriedSomeStatisticalVO;
+import com.diagbot.vo.Taggeds;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年12月3日 上午9:24:35
+ */
+@Component
+public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImpl{
+
+	/**
+	 * 批量保存
+	 * @param buriedSomeStatisticalVO
+	 * @return
+	 */
+	public boolean saveBuriedSomeStatistical(@Valid BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
+		List<BuriedSomeStatistical>  buriedList = new ArrayList<BuriedSomeStatistical>();
+		List<Taggeds> taggeds = buriedSomeStatisticalVO.getTaggeds();
+		for(Taggeds taggedsNew : taggeds){	
+			BuriedSomeStatistical buriedData =new BuriedSomeStatistical();
+			buriedData.setCreator(buriedSomeStatisticalVO.getDoctorId().toString());
+			buriedData.setDoctorId(buriedSomeStatisticalVO.getDoctorId());
+			buriedData.setGmtCreate(DateUtil.now());
+			buriedData.setHospitalDeptId(buriedSomeStatisticalVO.getHospitalDeptId());
+			buriedData.setHospitalId(buriedSomeStatisticalVO.getHospitalId());
+			buriedData.setInquiryCode(buriedSomeStatisticalVO.getInquiryCode());
+			buriedData.setPatientId(buriedSomeStatisticalVO.getPatientId());
+			buriedData.setLabelId(taggedsNew.getLabelId());
+			buriedData.setLabelName(taggedsNew.getLabelName());
+			buriedData.setOperationNum(taggedsNew.getOperationNum());
+			buriedData.setOperationType(taggedsNew.getOperationType());
+			buriedList.add(buriedData);
+		}
+		
+		boolean res = insertCodeBatch(buriedList);
+		return res;
+	}
+
+	
+}

+ 2 - 1
icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -13,6 +13,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.GsonUtil;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosIdVO;
@@ -106,7 +107,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 		templateInfo.setGmtCreate(DateUtil.now());//创建时间
 		templateInfo.setGmtCreate(DateUtil.now());//创建时间
 		templateInfo.setHospitalDeptId(templateInfosVO.getHospitalDeptId());//部门id
 		templateInfo.setHospitalDeptId(templateInfosVO.getHospitalDeptId());//部门id
 		templateInfo.setHospitalId(templateInfosVO.getHospitalId());//医院id
 		templateInfo.setHospitalId(templateInfosVO.getHospitalId());//医院id
-		templateInfo.setPreview(templateInfosVO.getPreview());//文本的展示
+		templateInfo.setPreview(GsonUtil.toJson(templateInfosVO.getPreview()));//文本的展示
 		templateInfo.setDataJson(templateInfosVO.getDataJson());//页面json
 		templateInfo.setDataJson(templateInfosVO.getDataJson());//页面json
 		templateInfo.setName(templateInfosVO.getModeName());//模板名称
 		templateInfo.setName(templateInfosVO.getModeName());//模板名称
 		templateInfo.setType(templateInfosVO.getModeType());//模板类型
 		templateInfo.setType(templateInfosVO.getModeType());//模板类型

+ 2 - 2
icss-service/src/main/java/com/diagbot/vo/TemplateInfosVO.java

@@ -25,8 +25,8 @@ public class TemplateInfosVO {
 	private Long hospitalDeptId;//部门id
 	private Long hospitalDeptId;//部门id
 	@NotBlank(message = "请输入模板类型")
 	@NotBlank(message = "请输入模板类型")
 	private String modeType;//模板类型
 	private String modeType;//模板类型
-	@NotBlank(message = "请输入预览文本")
-	private String preview;//预览文本
+	@NotNull(message = "请输入预览文本")
+	private ContentsVO preview;//预览文本
 	@NotBlank(message = "请输入模板数据")
 	@NotBlank(message = "请输入模板数据")
 	private String dataJson;//模板数据
 	private String dataJson;//模板数据
 }
 }

+ 46 - 0
icss-service/src/main/java/com/diagbot/web/BuriedSomeStatisticalController.java

@@ -0,0 +1,46 @@
+package com.diagbot.web;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.BuriedSomeStatisticalFacade;
+import com.diagbot.vo.BuriedSomeStatisticalVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 数据埋点统计表 前端控制器
+ * @date 2018年12月3日 上午9:24:22
+ */
+@RestController
+@RequestMapping("/buriedSomeStatistical")
+@Api(value = "数据埋点统计API[by:wangfeng]", tags = { "WF——数据埋点统计API" })
+@SuppressWarnings("unchecked")
+public class BuriedSomeStatisticalController {
+
+	@Autowired
+	BuriedSomeStatisticalFacade buriedSomeStatisticalFacade;
+
+	@ApiOperation(value = "数据埋点统计保存[by:wangfeng]", notes = "数据埋点统计保存")
+	@PostMapping("/saveBuriedSomeStatisticals")
+	@SysLogger("saveBuriedSomeStatisticals")
+	@Transactional
+	public RespDTO<Boolean> saveBuriedSomeStatisticals(@Valid @RequestBody BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
+
+		boolean res = buriedSomeStatisticalFacade.saveBuriedSomeStatistical(buriedSomeStatisticalVO);
+
+		return RespDTO.onSuc(res);
+	}
+
+}