报告查询接口

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegLisReportController.java

@@ -0,0 +1,50 @@
+package com.transitPlatForm.transitPF.controller;
+
+import com.transitPlatForm.common.core.controller.BaseController;
+import com.transitPlatForm.common.core.page.TableDataInfo;
+import com.transitPlatForm.transitPF.mapper.RegLisReportMapper;
+import com.transitPlatForm.transitPF.pojo.RegGetReportsList;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 区域检验中心，检验报告查询
+ */
+@Api(tags = "区域检验中心-检验报告查询")
+@RestController
+@RequestMapping("/transitLisReport")
+@Slf4j
+public class RegLisReportController extends BaseController {
+
+    @Autowired
+    RegLisReportMapper regLisReportMapper;
+
+    @ApiOperation("检验报告数据")
+    @GetMapping("/lisReportList")
+    public TableDataInfo getLisReportList(RegGetReportsList regGetReportsList){
+        startPage();
+        List<Map<String, Object>> lisReportList = regLisReportMapper.getLisReportList(regGetReportsList);
+        return getDataTable(lisReportList);
+    }
+
+    @ApiOperation("获取报告明细数据")
+    @GetMapping("/reportDetail")
+    public List<Map<String,Object>> getLisReportDetail(String bgdh){
+    	return regLisReportMapper.getLisReportDetail(bgdh);
+    }
+
+    @ApiOperation("获取细菌报告数据")
+    @GetMapping("/reportDetailMed")
+    public List<Map<String,Object>> getRegGetresultmed(String bgdh,String xmdh){
+    	return regLisReportMapper.getRegGetresultmed(bgdh,xmdh);
+    }
+
+}

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegLisReportMapper.java

@@ -0,0 +1,14 @@
+package com.transitPlatForm.transitPF.mapper;
+
+
+import com.transitPlatForm.transitPF.pojo.RegGetReportsList;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RegLisReportMapper {
+    List<Map<String, Object>> getLisReportList(RegGetReportsList regGetReportsList);
+    List<Map<String,Object>> getLisReportDetail(String bgdh);
+    List<Map<String, Object>> getRegGetresultmed(@Param("bgdh") String bgdh ,@Param("xmdh") String xmdh);
+}

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegGetReportsList.java

@@ -0,0 +1,47 @@
+package com.transitPlatForm.transitPF.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RegGetReportsList {
+    private String yljg;
+    private Date jyrq;
+    private String jyrqname;
+    private String yq;
+    private String ybh;
+    private String yblx;
+    private String brxm;
+    private String brdh;
+    private String ch;
+    private String zd;
+    private String sqh;
+    private String ksdh;
+    private String jzbz;
+    private String alarmflag;
+    private String dybz;
+    private String nl;
+    private String ksname;
+    private String brlyname;
+    private String brxbname;
+    private String yblxname;
+    private String sjysname;
+    private String yqmc;
+    private String yqdl;
+    private String sqdh;
+    private String jymd;
+    private String st;
+    private String et;
+    private Date sqsj;
+    private Date cysj;
+    private Date zxsj;
+    private Date bbsjsj;
+    private Date jssj;
+    private Date confirmtime;
+    private String lisgroup;
+}

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java

@@ -127,6 +127,8 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
             regApply.setCreate_by(regApply.getUserCode());
             regApply.setCreate_time(commonUtil.getCurrentTime());
             regApply.setOrderTime(commonUtil.getCurrentTime());
+            regApply.setSrcHospCode(SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJG());
+            regApply.setSrcHospName(SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJGName());
 
             //病人生日
             Date birthDayFromAge = LisUtil.getBirthDayFromAge(Integer.parseInt(regApply.getPatAge()), regApply.getAgeUnit());
@@ -239,7 +241,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
             reqSqdInfo.put("sample_PatId", regApply.getPatId());
             reqSqdInfo.put("sample_PatCardType", regApply.getPatCardType());
             reqSqdInfo.put("sample_PatCardNo", regApply.getPatCardNo());
-            reqSqdInfo.put("sample_PatType",regApply.getPatType());//regApply.getPatType()  这里条码的病人来源，需要根据医院的需求修改
+            reqSqdInfo.put("sample_PatType",regApply.getPatType());
             reqSqdInfo.put("sample_RegNo", regApply.getRegNo());
             reqSqdInfo.put("sample_PatName", regApply.getPatName());
             reqSqdInfo.put("sample_PatSex", regApply.getPatSex());
@@ -290,7 +292,14 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
             public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                 String itemClass1 = LisUtil.isBank(o1.get("sample_SrcHospBarcode").toString().trim());
                 String itemClass2 = LisUtil.isBank(o2.get("sample_SrcHospBarcode").toString().trim());
-                return itemClass1.compareTo(itemClass2);
+                int i = itemClass1.compareTo(itemClass2);
+                if(i == 0){
+                    String sampleSampleTypeName1 = LisUtil.isBank(o1.get("sample_SampleTypeName").toString().trim());
+                    String sampleSampleTypeName2 = LisUtil.isBank(o2.get("sample_SampleTypeName").toString().trim());
+                    return sampleSampleTypeName1.compareTo(sampleSampleTypeName2);
+                }else{
+                    return i;
+                }
             }
         });
 
@@ -374,6 +383,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
             regTransitSample.setAreaName(LisUtil.isBank(stringObjectMap.get("sample_AreaName")));
             regTransitSample.setPatBed(LisUtil.isBank(stringObjectMap.get("sample_PatBed")));
             regTransitSample.setDiagnosisCode(LisUtil.isBank(stringObjectMap.get("sample_DiagnosisCode")));
+            regTransitSample.setDiagnosisName(LisUtil.isBank(stringObjectMap.get("sample_DiagnosisName")));
             regTransitSample.setOrderUserCode(LisUtil.isBank(stringObjectMap.get("sample_OrderUserCode")));
             regTransitSample.setOrderUserName(LisUtil.isBank(stringObjectMap.get("sample_OrderUserName")));
             regTransitSample.setOrderTime(DateUtil.parse(LisUtil.isBank(stringObjectMap.get("sample_OrderTime")), "yyyy-MM-dd HH:mm:ss"));
@@ -557,7 +567,19 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
         String patId = regRequestInfoDTO.getPatId();
         String loginYLJG = SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJG();
         RegApply regApply = regRequestInfoMapper.getPatInfo(patId, loginYLJG);
-        return new Result("0","查询数据成功！",regApply);
+        RegApply regApply1 = new RegApply();
+        regApply1.setPatId(regApply.getPatId());
+        regApply1.setPatType(regApply.getPatType());
+        regApply1.setPatName(regApply.getPatName());
+        regApply1.setPatSex(regApply.getPatSex());
+        regApply1.setPatAge(regApply.getPatAge());
+        regApply1.setAgeUnit(regApply.getAgeUnit());
+        regApply1.setPatBirthday(regApply.getPatBirthday());
+        regApply1.setPhone(regApply.getPhone());
+        regApply1.setAddress(regApply.getAddress());
+        regApply1.setDiagnosisCode(regApply.getDiagnosisCode());
+        regApply1.setDiagnosisName(regApply.getDiagnosisName());
+        return new Result("0","查询数据成功！",regApply1);
     }
 
     private String getLocalid() {

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java

@@ -162,6 +162,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
                 case "100": //标本退回
                     if (statusSample.equals("100")) return new Result("0", "该标本已经退回！");
                     if (Integer.parseInt(statusSample) < 50) return new Result("-1", barcode+"该标本还未签收，不能退回！");
+                    regTransitSample.setBackReasons(backReasons);
                     regTransitSample.setBackUserCode(backUserCode);
                     regTransitSample.setBackUserName(backUserName);
                     regTransitSample.setBackTime(commonUtil.getCurrentTime());

pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.transitPlatForm.transitPF.mapper.RegLisReportMapper">
+    <select id="getLisReportList" resultType="map">
+        <![CDATA[select * from reg_getReportsList where jyrq >= CONVERT(varchar(100), #{st}, 120) and jyrq <= CONVERT(varchar(100), #{et}, 120)]]>
+        <if test="brxm != null and brxm != ''"> AND brxm like '%'+#{brxm}+'%'</if>
+        <if test="brdh != null and brdh != ''"> AND brdh like '%'+#{brdh}+'%'</if>
+        <if test="sqh != null and sqh != ''"> AND sqh like '%'+#{sqh}+'%'</if>
+        <if test="dybz != null and dybz != ''"> AND dybz = #{dybz}</if>
+        <if test="ksdh !=null and ksdh != ''"> and ksdh = #{ksdh}</if>
+        <if test="alarmflag != null"> <![CDATA[AND alarmflag = #{alarmflag}]]></if>
+        <if test="ch != null and ch !=''"> and ch = #{ch}</if>
+        <if test="jzbz != null">and jzbz = #{jzbz}</if>
+        <if test="brlyname != null and brlyname != ''"> and brlyname = #{brlyname}</if>
+    </select>
+
+    <select id="getLisReportDetail" resultType="map">
+        select * from reg_getReportDetail where bgdh = #{bgdh}
+    </select>
+
+    <select id="getRegGetresultmed" resultType="map">
+        select * from reg_getresultmed where bgdh = #{bgdh}
+        <if test="xmdh != null and xmdh !=''">and xmdh = #{xmdh}</if>
+    </select>
+
+</mapper>