打印保存修改

icss-service/src/main/java/com/diagbot/facade/PrintRecordFacade.java

@@ -1,10 +1,11 @@
 package com.diagbot.facade;
 
-import com.diagbot.util.DateUtil;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.entity.PrintRecord;
 import com.diagbot.service.impl.PrintRecordServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.GsonUtil;
 import com.diagbot.vo.PrintRecordsVO;
 
 /**
@@ -32,7 +33,7 @@ public class PrintRecordFacade extends PrintRecordServiceImpl{
 		printRecord.setHospitalId(printRecordsVO.getHospitalId());//医院id
 		printRecord.setInquiryCode(printRecordsVO.getInquiryCode());//就诊号
 		printRecord.setPatientId(printRecordsVO.getPatientId());//患者id
-		printRecord.setContent(printRecordsVO.getContent());//文件展现
+		printRecord.setContent(GsonUtil.toJson(printRecordsVO.getContent()));//文件展现
 		printRecord.setDataJson(printRecordsVO.getDataJson());//打印数据json
 		boolean res = save(printRecord);
 		return res;

icss-service/src/main/java/com/diagbot/vo/ContentsVO.java

@@ -0,0 +1,27 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）
+ * @date 2018年11月23日 下午2:20:02
+ */
+
+@Getter
+@Setter
+public class ContentsVO {
+	 /**
+     * 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）
+     */
+    private String chief;//主诉
+    private String present;//现病史
+    private String other;//其他史
+    private String vital;//查体
+    private String lis;//化验
+    private String pacs;//辅检
+    private String diag;//诊断
+    private String advice;//医嘱
+}

icss-service/src/main/java/com/diagbot/vo/PrintRecordsVO.java

@@ -1,5 +1,7 @@
 package com.diagbot.vo;
 
+import java.util.List;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
@@ -51,8 +53,7 @@ public class PrintRecordsVO {
     /**
      * 文本内容
      */
-	@NotBlank(message = "请输入文本内容")
-    private String content;
+    private ContentsVO content;
 
     /**
      * 内容JSON字符串(打印页面展示)

icss-service/src/main/java/com/diagbot/web/PrintRecordController.java

@@ -1,7 +1,8 @@
 package com.diagbot.web;
 
-
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PrintRecordFacade;
+import com.diagbot.vo.ContentsVO;
 import com.diagbot.vo.PrintRecordsVO;
 
 import io.swagger.annotations.Api;
@@ -29,20 +31,21 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "打印记录API[by:wangfeng]", tags = { "打印记录API" })
 @SuppressWarnings("unchecked")
 public class PrintRecordController {
-	
+
 	@Autowired
 	PrintRecordFacade printRecordFacade;
-	
-	@ApiOperation(value = "保存打印记录",notes = "保存打印记录")
-    @PostMapping("/savePrintRecords")
+
+	@ApiOperation(value = "保存打印记录", notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>"
+			+ "患者id:patientId</br>"
+			+ "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson:内容JSON字符串(打印页面展示)")
+	@PostMapping("/savePrintRecords")
 	@SysLogger("savePrintRecords")
 	@Transactional
-    public RespDTO<Boolean> savePrintRecords(@Valid @RequestBody PrintRecordsVO printRecordsVO) {
+	public RespDTO<Boolean> savePrintRecords(@Valid @RequestBody PrintRecordsVO printRecordsVO) {
+
+		boolean res = printRecordFacade.savePrintRecord(printRecordsVO);
 
-        boolean res = printRecordFacade.savePrintRecord(printRecordsVO);
-        
-        return RespDTO.onSuc(res);
-    }
-	
+		return RespDTO.onSuc(res);
+	}
 
 }