修改bug 以及添加 查看简阳项目详情的地方

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/JianYanJianChaController.java

@@ -122,6 +122,11 @@ public class JianYanJianChaController {
         return server.biaoBenShuJu(name);
     }
 
+    @GetMapping("/viewInspectionItemDetails")
+    public ResultVo<List<JianYanFeiYongXiangQing>> viewInspectionItemDetails(@RequestParam("orderCode") String orderCode) {
+        return server.viewInspectionItemDetails(orderCode);
+    }
+
     @GetMapping("/shanChuJianChaJianYan")
     public ResultVo<String> shanChuJianChaJianYan(@RequestParam("reqNo") Integer reqNo,
                                                   @RequestParam("patNo") String patNo,

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.casefrontsheet.YshHzRecord;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
-import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.JcZdClass;
-import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
-import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshZdYjTemplate;
-import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.ZyTcYj;
+import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.*;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.PatientTemp;
 
 import java.math.BigDecimal;
@@ -207,7 +204,7 @@ public interface JianYanJianChaDao {
             "       a.order_type        as                                          orderType, " +
             "       (select rtrim(name) from zd_unit_code with (NOLOCK) where code = a.exec_dept) execDeptName, " +
             "       getdate()           as                                          startTime," +
-            "       inspect_stuff, " +
+            "       inspect_stuff as inspectStuff , " +
             "       inspectStuffName = (select rtrim(name) from jy_zd_sample with (NOLOCK) where code = inspect_stuff) " +
             "FROM yz_order_item a with (NOLOCK), " +
             "     zy_tc_detail_yj b with (NOLOCK), " +
@@ -433,4 +430,17 @@ public interface JianYanJianChaDao {
 
     @Delete("delete from yz_act_order where act_order_no = #{orderNo}")
     void shanChuYiZhu(@Param("orderNo") BigDecimal orderNo);
+
+
+    @Select("select a.order_code,\n" +
+            "       a.occ_code,\n" +
+            "       b.name,\n" +
+            "       a.amount,\n" +
+            "       cast(a.amount * b.charge_amount as varchar) as charge_amount,\n" +
+            "       cast(b.charge_amount as varchar)            as unit_price\n" +
+            "from yz_order_occurence a,\n" +
+            "     zd_charge_item b\n" +
+            "where a.occ_code = b.code\n" +
+            "  and a.order_code = #{orderCode}")
+    List<JianYanFeiYongXiangQing> viewInspectionItemDetails(String orderCode);
 }

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/JianYanFeiYongXiangQing.java

@@ -0,0 +1,35 @@
+package thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class JianYanFeiYongXiangQing {
+    /**
+     * 检查编码
+     */
+    private String orderCode;
+
+    /**
+     * 收费编码
+     */
+    private String occCode;
+    private String name;
+
+    /**
+     * 数量
+     */
+    private Integer amount;
+
+    /**
+     * 金额
+     */
+    private String chargeAmount;
+
+    /**
+     * 单价
+     */
+    private String unitPrice;
+
+}

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -458,6 +458,11 @@ public class JianYanJianChaShenQingServer {
         return ResultVoUtil.success(dao.biaoBenLeiXing(StringUtil.isContainChinese(name)));
     }
 
+    @DS("his")
+    public ResultVo<List<JianYanFeiYongXiangQing>> viewInspectionItemDetails(String orderCode) {
+        return ResultVoUtil.success(dao.viewInspectionItemDetails(orderCode));
+    }
+
 
     public ResultVo<String> shanChuJianChaJianYan(Integer reqNo, String patNo, Integer times) {
         if (StringUtil.isBlank(patNo)) {