提示信息完善

src/main/java/com/diagbot/dto/ExamineInfoDTO.java

@@ -39,18 +39,36 @@ public class ExamineInfoDTO {
     /**
      * 检查时间
      */
+    @JsonIgnore
     private String cTime;
 
+    /**
+     * 返回检查时间
+     */
+    private Date checkTime;
+
     /**
      * 报告时间
      */
+    @JsonIgnore
     private String rTime;
 
+    /**
+     * 返回报告时间
+     */
+    private Date repTime;
+
+
     /**
      * 开单医生
      */
     private String doctorName;
 
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
     /**
      * 质检提示信息
      */

src/main/java/com/diagbot/service/impl/MedLisInfoServiceImpl.java

@@ -15,6 +15,9 @@ import com.diagbot.vo.ExamineInfoVO;
 import com.diagbot.vo.ExamineSonInfoVO;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -32,7 +35,7 @@ import java.util.Set;
 public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisInfo> implements MedLisInfoService {
 
 
-    public IPage<ExamineInfoDTO> getExamineInfo(ExamineInfoVO examineInfoVO) {
+    public IPage<ExamineInfoDTO> getExamineInfo(ExamineInfoVO examineInfoVO) throws ParseException {
 
         List<String> infos = this.baseMapper.getInfo(examineInfoVO.getHospitalId(), examineInfoVO.getBehospitalCode());
 
@@ -55,6 +58,16 @@ public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisI
         }
 
         IPage<ExamineInfoDTO> page = this.baseMapper.getExamineInfo(examineInfoVO, infoSet);
+        List<ExamineInfoDTO> records = page.getRecords();
+        for (ExamineInfoDTO record : records) {
+            String cTime = record.getCTime();
+            String rTime = record.getRTime();
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date cTimeDate = simpleDateFormat.parse(cTime);
+            Date rTimeDate = simpleDateFormat.parse(rTime);
+            record.setCheckTime(cTimeDate);
+            record.setRepTime(rTimeDate);
+        }
         return page;
     }
 

src/main/java/com/diagbot/web/MedLisInfoController.java

@@ -37,10 +37,11 @@ public class MedLisInfoController {
 
     @ApiOperation(value = "获取检验信息[by:cy]",
             notes = "behospitalCode：病人住院序号<br>" +
-                    "checkType：检验类型（模糊搜索）<br>" +
-                    "daItemName：检验项目名称（模糊搜索）<br>" +
-                    "daStartDateStart：检验开始时间<br>" +
-                    "daStartDateEnd：检验结束时间<br>")
+                    "examineType：检验项类型缺陷判别<br>" +
+                    "examineItemType：检验类型判别（模糊搜索）<br>" +
+                    "examineItemName：检验项目名称（模糊搜索）<br>" +
+                    "jyDateStart：检验开始时间<br>" +
+                    "jyDateEnd：检验结束时间<br>")
     @PostMapping("/getExaminePage")
     @SysLogger("getExaminePage")
     public RespDTO<IPage<ExamineInfoDTO>> getExaminePage(@RequestBody @Valid ExamineInfoVO examineInfoVO) {

src/main/java/com/diagbot/web/MedPacsInfoController.java

@@ -35,6 +35,7 @@ public class MedPacsInfoController {
 
     @ApiOperation(value = "获取检查信息[by:cy]",
             notes = "behospitalCode：病人住院序号<br>" +
+                    "checkType：检查项类型缺陷判别<br>" +
                     "checkItemType：检查类型（模糊搜索）<br>" +
                     "checkItemName：检查项目名称（模糊搜索）<br>" +
                     "jxDateStart：检查时间开始<br>" +

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -28,6 +28,7 @@
         select b.*
         from(
         SELECT
+        t1.rep_no as repNo,
         t1.rep_name as examineItemName,
         t1.rep_type_name as examineItemType,
         CONCAT( t1.rep_name, '(',DATE_FORMAT( t1.check_date,'%Y-%m-%d'),')')as info,