增加平台项目维护，医疗机构级别

pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
     <sql id="selecthospitalVo">
-        select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark
+        select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark,hospital_type
         from Reg_hospital
     </sql>
 

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

@@ -45,7 +45,9 @@ public class RegRequestInfoController extends BaseController {
     @ApiOperation("开单项目信息")
     @GetMapping("/getItemInfo")
     public Result getItemInfo() {
-        return regRequestInfoService.getItemInfo();
+        String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG();
+        if (loginYLJG == null || loginYLJG.equals("")) return new Result("-1", "获取登录的医疗机构失败！");
+        return regRequestInfoService.getItemInfo(loginYLJG);
     }
 
 

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

@@ -86,4 +86,10 @@ public class RegTransitSampleController extends BaseController {
         return regTransitSampleService.getInpInfo(dept,st,et,yljg,getUsername());
     }
 
+    @ApiOperation("获取已打印的条码数据")
+    @GetMapping("/sampleCollect")
+    public Result getSampleCollectInfo(String barcode){
+        return regTransitSampleService.getSampleCollectInfo(barcode);
+    }
+
 }

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegItemController.java

@@ -1,6 +1,7 @@
 package com.transitPlatForm.transitPF.controller.dict;
 
 import com.transitPlatForm.common.annotation.Log;
+import com.transitPlatForm.common.annotation.RepeatSubmit;
 import com.transitPlatForm.common.core.controller.BaseController;
 import com.transitPlatForm.common.core.domain.Result;
 import com.transitPlatForm.common.core.domain.entity.reg.RegItem;
@@ -53,4 +54,18 @@ public class RegItemController extends BaseController {
     public Result delete(@RequestBody RegItem regItem){
         return regItemService.delete(regItem);
     }
+
+    @ApiOperation("获取条码已对照项目")
+    @GetMapping("/compare")
+    public Result queryCompareInfo(String itemclass){
+        return regItemService.queryCompareInfo(itemclass);
+    }
+
+    @ApiOperation("获取条码未对照项目")
+    @GetMapping("/noCompare")
+    public Result queryNoCompareInfo(String itemclass,String compareStatus){
+        //compareStatus  1 未对照项目  2. 其他对照项目
+        if(compareStatus == null) return new Result("-1","compareStatus参数不能为空！");
+        return regItemService.queryNoCompareInfo(itemclass,compareStatus);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.transitPlatForm.transitPF.mapper;
 
 import com.transitPlatForm.common.core.domain.entity.reg.RegItem;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -9,4 +10,7 @@ public interface RegItemMapper {
     void add(RegItem regItem);
     void update(RegItem regItem);
 
+    List<RegItem> queryCompareInfo(String itemclass);
+
+    List<RegItem> queryNoCompareInfo(@Param("itemclass") String itemclass,@Param("compareStatus") String compareStatus);
 }

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

@@ -14,7 +14,7 @@ public interface RegRequestInfoMapper {
 
     List<RegApplyDetail> queryReqDetail(String applyId);
 
-    List<Map<String,Object>> getItemInfo();
+    List<Map<String,Object>> getItemInfo(String hospitalType);
 
     List<RegTransitSampleDetail> existSQD(@Param("applyId") String applyId, @Param("applyDetailId") String applyDetailId);
 }

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemService.java

@@ -2,6 +2,7 @@ package com.transitPlatForm.transitPF.service;
 
 import com.transitPlatForm.common.core.domain.Result;
 import com.transitPlatForm.common.core.domain.entity.reg.RegItem;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,4 +14,8 @@ public interface RegItemService {
     Result update(RegItem regItem);
 
     Result delete(RegItem regItem);
+
+    Result queryCompareInfo(String itemclass);
+
+    Result queryNoCompareInfo(String itemclass, String compareStatus);
 }

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java

@@ -12,7 +12,7 @@ public interface RegRequestInfoService {
 
     Result queryReqDetail(String applyId);
 
-    Result getItemInfo();
+    Result getItemInfo(String loginYLJG);
 
     Result saveReqInfo(ReqApplyInfoDTO reqApplyInfoDTO);
 

pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java

@@ -22,4 +22,6 @@ public interface RegTransitSampleService {
     Result getOutPatientInfo(String patNo,String st,String et,String userId,String yljg);
 
     Result getInpInfo(String dept, String st, String et, String yljg,String userId);
+
+    Result getSampleCollectInfo(String barcode);
 }

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

@@ -59,4 +59,24 @@ public class RegItemServiceImpl implements RegItemService {
         regItemMapper.update(regItem);
         return new Result("0","操作成功！");
     }
+
+    /**
+     * 获取条码已对照项目
+     * @return
+     */
+    @Override
+    public Result queryCompareInfo(String itemclass) {
+        List<RegItem> regItemList = regItemMapper.queryCompareInfo(itemclass);
+        return new Result("0","获取数据成功！",regItemList);
+    }
+
+    /**
+     * 获取条码未对照项目
+     * @return
+     */
+    @Override
+    public Result queryNoCompareInfo(String itemclass,String compareStatus) {
+        List<RegItem> regItemList = regItemMapper.queryNoCompareInfo(itemclass,compareStatus);
+        return new Result("0","获取未对照项目成功！",regItemList);
+    }
 }

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

@@ -12,6 +12,7 @@ import com.transitPlatForm.common.utils.ip.IpUtils;
 import com.transitPlatForm.interfaceCommon.mapper.CommonMapper;
 import com.transitPlatForm.interfaceCommon.mapper.RegApplyDetailMapper;
 import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper;
+import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper;
 import com.transitPlatForm.interfaceCommon.utils.CommonUtil;
 import com.transitPlatForm.interfaceCommon.utils.LisUtil;
 import com.transitPlatForm.interfaceCommon.websocket.ChatWebSocketServer;
@@ -57,6 +58,8 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
     RequestInfoUtil requestInfoUtil;
     @Resource
     LabIntersendListMapper labIntersendListMapper;
+    @Autowired
+    RegHospitalMapper hospitalMapper;
 
 
     /**
@@ -86,8 +89,9 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
     }
 
     @Override
-    public Result getItemInfo() {
+    public Result getItemInfo(String loginYLJG) {
-        List<Map<String, Object>> regItemList = regRequestInfoMapper.getItemInfo();
+        String hospitalType = hospitalMapper.selectHospitalById(Long.valueOf(loginYLJG)).getHospital_type();
+        List<Map<String, Object>> regItemList = regRequestInfoMapper.getItemInfo(hospitalType);
         return new Result("0", "查询成功！", regItemList);
     }
 
@@ -208,6 +212,8 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
         List<RegTransitSampleDetail> regTransitSampleDetailList = new ArrayList<>();
         List<Map<String, Object>> reqSqdInfoList = new ArrayList<>();
 
+        String hospitalBrly = commonUtil.selectConfigByKey("hospital_brly");
+
         //获取项目的对照信息列表
         List<Map<String, Object>> feeClassList = commonMapper.getFeeClassList();
         for (RegApplyDetail regApplyDetail : regApplyDetailList) {
@@ -232,7 +238,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());
+            reqSqdInfo.put("sample_PatType", hospitalBrly);//regApply.getPatType()  这里条码的病人来源，需要根据医院的需求修改
             reqSqdInfo.put("sample_RegNo", regApply.getRegNo());
             reqSqdInfo.put("sample_PatName", regApply.getPatName());
             reqSqdInfo.put("sample_PatSex", regApply.getPatSex());
@@ -301,7 +307,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService {
                 xh++;
                 stringObjectMap.put("sample_Barcode", barcode);
                 stringObjectMap.put("detail_OrderItemSerial", xh);
-                jymd = LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"));
+                jymd = jymd + "," + LisUtil.isBank(stringObjectMap.get("detail_OrderItemName"));
                 regTransitSample.setCheckPUR(jymd);
                 regTransitSampleList.set(k, regTransitSample);
 

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

@@ -74,6 +74,12 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
     }
 
 
+    /**
+     * 标本条码状态修改
+     * @param sampleSignVO
+     * @param userId
+     * @return
+     */
     @Override
     public Result sampleSign(SampleSignVO sampleSignVO, String userId) {
         String status = sampleSignVO.getStatus();
@@ -196,6 +202,23 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService {
         return regInterfaceImpl.addTransitSample(jsonData);
     }
 
+    /**
+     * 获取待送检项目
+     * @param barcode
+     * @return
+     */
+    @Override
+    public Result getSampleCollectInfo(String barcode) {
+        RegTransitSample regTransitSample = new RegTransitSample();
+        regTransitSample.setBarcode(barcode);
+        List<RegTransitSample> regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample);
+        if(regTransitSampleList.size() <= 0) return new Result("-1","没有找到该标本的数据！");
+        String status = regTransitSampleList.get(0).getStatus();
+        if(status.equals("30")) return new Result("-1","该标本已经送检！");
+        if(!status.equals("10") && !status.equals("20")) return new Result("-1","该条码已经签收，或者已经上机！");
+        return new Result("0","获取数据成功！",regTransitSampleList.get(0));
+    }
+
     @Override
     public List<RegTransitSample> getRegTransitSample(RegTransitSample labQuerySample) {
         List<RegTransitSample>  regTransitSampleList = regTransitSampleMapper.getRegTransitSample(labQuerySample);

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

@@ -44,6 +44,7 @@
 
     <select id="selectDictAll" resultMap="RegDictResult">
         <include refid="selectDictVo"/>
+        where status = '0'
         order by dict_Sort
     </select>
 

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

@@ -14,17 +14,17 @@
     </select>
 
     <insert id="add">
-        insert into reg_item(itemcode, itemname, itemclass, status,dj,dj1,dj2,dj3,dj4)
+        insert into reg_item(itemcode, itemname, itemclass, status,dj,dj1,dj2,dj3,dj4,zjf,yblx)
         values(
-                #{itemcode},#{itemname},#{itemclass},#{status},#{dj},#{dj1},#{dj2},#{dj3},#{dj4}
+                #{itemcode},#{itemname},#{itemclass},#{status},#{dj},#{dj1},#{dj2},#{dj3},#{dj4},#{zjf},#{yblx}
               )
     </insert>
 
     <update id="update">
         update reg_item
         <set>
-            <if test="itemcode != null and itemcode != ''">itemcode = #{itemcode},</if>
             <if test="itemname != null and itemname != ''">itemname = #{itemname},</if>
+            <if test="itemclass != null ">itemclass = #{itemclass},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="zjf != null and zjf != ''">zjf = #{zjf},</if>
             <if test="dj != null ">dj = #{dj},</if>
@@ -37,4 +37,14 @@
         where itemcode = #{itemcode}
     </update>
 
+    <select id="queryCompareInfo" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegItem">
+        <![CDATA[select * from reg_item where (itemclass is not null and itemclass <> '') and Status = '0' and itemclass = #{itemclass}]]>
+    </select>
+
+    <select id="queryNoCompareInfo" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegItem">
+        select * from reg_item where Status = '0'
+        <if test="compareStatus != null and compareStatus == 1">and (itemclass is null or itemclass = '')</if>
+        <if test="compareStatus != null and compareStatus == 2"><![CDATA[and (isnull(itemclass,'') <> #{itemclass}) and itemclass is not null and itemclass <> '']]></if>
+    </select>
+
 </mapper>

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

@@ -17,7 +17,9 @@
     </select>
 
     <select id="getItemInfo" resultType="map">
-        select b.itemclass_tips, b.classid,(case when isnull(a.yblx,'') = '' then b.itemclass_yblx else a.yblx end) as itemclass_yblx, a.* from reg_item  a,reg_itemclass b where a.itemclass = b.itemclass_code and a.status = '0'
+        select b.itemclass_tips, b.classid,(case when isnull(a.yblx,'') = '' then b.itemclass_yblx else a.yblx end) as itemclass_yblx, a.*,
+               (case #{hospitalType} when '1' then a.dj1 when '2' then a.dj2 when '3' then a.dj3 else a.dj end  ) as  price
+        from reg_item  a,reg_itemclass b where a.itemclass = b.itemclass_code and a.status = '0'
     </select>
 
     <select id="existSQD" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail">