Merge remote-tracking branch 'origin/master'

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabResultMed.java

@@ -1,5 +1,7 @@
 package com.czlis.common.core.domain.entity.lis;
 
+import com.czlis.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,7 +11,8 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class LabResultMed {
+public class LabResultMed  extends BaseEntity {
+  @JsonFormat(pattern = "yyyy-MM-dd")
   private Date jyrq;
   private String yq;
   private String ybh;

lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmMedgroup.java

@@ -17,4 +17,5 @@ public class XmMedgroup {
     private BigDecimal nymic;
     private BigDecimal zjmic;
     private String ismic;
+    private String ywmc;
 }

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java

@@ -10,6 +10,7 @@ import com.czlis.common.core.domain.entity.lis.XmMed;
 import com.czlis.common.core.page.TableDataInfo;
 import com.czlis.common.enums.BusinessType;
 import com.czlis.interfaceCommon.constants.SysLogConstants;
+import com.czlis.liswork.mapper.LisWorkGermMapper;
 import com.czlis.liswork.mapper.xtwh.XmMedMapper;
 import com.czlis.liswork.service.LisWorkGermService;
 import io.swagger.annotations.Api;
@@ -29,6 +30,8 @@ public class LisWorkGermController extends BaseController {
     @Autowired
     XmMedMapper xmMedMapper;
     @Autowired
+    LisWorkGermMapper lisWorkGermMapper;
+    @Autowired
     LisWorkGermService lisWorkGermService;
     @ApiOperation("获取药敏字典")
     @GetMapping("/getmeddict")
@@ -108,7 +111,12 @@ public class LisWorkGermController extends BaseController {
     @ApiOperation("获取药敏模板")
     @GetMapping("/getmedgroup")
     public Result getmedgroup(String mbmc){
-        return lisWorkGermService.getmedgroup(mbmc);
+        return new Result("0","成功",lisWorkGermMapper.getmedgroup(mbmc));
+    }
+    @ApiOperation("获取药敏模板列表")
+    @GetMapping("/getmedgrouplist")
+    public Result getmedgrouplist(){
+        return new Result("0", "成功！",lisWorkGermMapper.getmedgrouplist());
     }
     @ApiOperation("获取微生物样本列表")
     @GetMapping("/wswsamplelist")

liswork/src/main/java/com/czlis/liswork/mapper/LisWorkGermMapper.java

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 public interface LisWorkGermMapper {
     List<LabPat> getSampleListday(@Param("yq") String yq, @Param("days")Integer days);
     List<LabPat> getSampleListWSW(@Param("jyrq") Date jyrq, @Param("yq") String yq);
@@ -18,5 +20,6 @@ public interface LisWorkGermMapper {
     List<XmMedDetail> getXmMedDetailNew(@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("ywdh") String ywdh);
     List<XmMedDetail> getXmMedDetail(@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("ywdh") String ywdh);
     String getXmMedDetailBZ(@Param("yq") String yq,@Param("xmdh") String xmdh);
-
+    List<Map<String, Object>> getmedgrouplist();
+    List<XmMedgroup> getmedgroup(String ywzmc);
 }

liswork/src/main/java/com/czlis/liswork/service/LisWorkGermService.java

@@ -14,7 +14,6 @@ public interface LisWorkGermService {
     Result getInstrid(String yq);
     Result getmedium(Date jyrq, String yq, String ybh);
     Result getcomlog(Date jyrq, String yq, String ybh);
-    Result getmedgroup(String mbmc);
     Result savemedresult(LabResultMed labResultmed);
     Result savemedresultall(List<LabResultMed> labResultmedlist);
     Result deletemedresult(LabResultMed labResultmed);

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java

@@ -32,8 +32,6 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
     LisWorkUtils lisWorkUtils;
     @Autowired
     LisWorkGermMapper lisWorkGermMapper;
-    @Autowired
-    XmMedgroupMapper xmMedgroupMapper;
     @Override
     public Result getresultinfo(Date jyrq, String yq, String ybh){
         List<LabResult> labResultList = commonUtil.getLabResultList(jyrq, yq, ybh);
@@ -180,12 +178,7 @@ public class LisWorkGermServiceImpl implements LisWorkGermService {
         List<ComLog> comLoglist=commonUtil.getComLog(comLog);
         return new Result("0","成功",comLoglist);
     }
-    @Override
+
-    public Result getmedgroup(String mbmc){
-        XmMedgroup xmMedgroup=new XmMedgroup();
-        xmMedgroup.setYwzmc(mbmc);
-        return new Result("0","成功",xmMedgroupMapper.query(xmMedgroup));
-    }
     /**
      * 修改结果
      *

liswork/src/main/resources/mapper/LisWorkGermMapper.xml

@@ -74,41 +74,35 @@
     </insert>
     <select id="getXmMedDetail" resultType="com.czlis.common.core.domain.entity.lis.XmMedDetail">
         SELECT * FROM xm_meddetail
-        WHERE yq = #{yq}  And
+        where ywzmc = '细菌' and yq = #{yq} and xmdh = #{xmdh}
-               xmdh = #{xmdh} And
-        <where>
             <if test="yq != null and yq != ''">and yq = #{yq} </if>
-        </where>
-        <where>
             <if test="xmdh != null and xmdh != ''">and xmdh = #{xmdh}</if>
-        </where>
-        <where>
             <if test="ywdh != null and ywdh != ''">and ywdh = #{ywdh}</if>
-        </where>
-        and ywzmc = '细菌'
     </select>
     <select id="getXmMedDetailNew" resultType="com.czlis.common.core.domain.entity.lis.XmMedDetail">
         SELECT xm_meddetail.*
         FROM xm_meddetail join xm_info on   xm_info.germclass=xm_meddetail.xmdh
-        <where>
+        where  xm_meddetail.yq = '_med_'
             <if test="yq != null and yq != ''">and xm_info.yq = #{yq} </if>
-        </where>
-        <where>
             <if test="xmdh != null and xmdh != ''">and xm_info.xmdh = #{xmdh}</if>
-        </where>
-        <where>
             <if test="ywdh != null and ywdh != ''">and xm_meddetail.ywdh = #{ywdh}</if>
-        </where>
-        and xm_meddetail.yq = '_med_'
     </select>
     <select id="getXmMedDetailBZ" resultType="String">
         SELECT com_dict.bz from xm_info join com_dict
         on zdlb = 'germclass' AND zddh =xm_info.germclass
         <where>
             <if test="yq != null and yq != ''">and xm_info.yq = #{yq} </if>
-        </where>
-        <where>
             <if test="xmdh != null and xmdh != ''">and xm_info.xmdh = #{xmdh}</if>
         </where>
     </select>
+    <select id="getmedgrouplist" resultType="map">
+        SELECT distinct ywzmc FROM xm_medgroup ORDER BY ywzmc
+    </select>
+    <select id="getmedgroup" resultType="com.czlis.common.core.domain.entity.lis.XmMedgroup">
+        select xm_medgroup.*,xm_med.ywmc from xm_medgroup join xm_med on xm_med.ywdh=xm_medgroup.ywdh
+        <where>
+            <if test="ywzmc != null and ywzmc != ''"> and xm_medgroup.ywzmc = #{ywzmc}</if>
+        </where>
+        order by xm_medgroup.xh
+    </select>
 </mapper>