修改包名

src/main/java/thyyxxk/webserver/controller/ShiTiJian/SiTjController.java → src/main/java/thyyxxk/webserver/controller/shitijian/SiTjController.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.controller.ShiTiJian;
+package thyyxxk.webserver.controller.shitijian;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.ShiTiJian.TiJianPiPeiPojo;
-import thyyxxk.webserver.entity.ShiTiJian.TiJianUploadInfosPojo;
-import thyyxxk.webserver.entity.ShiTiJian.TiJianYuYuePojo;
-import thyyxxk.webserver.service.ShiTiJian.SiTjService;
+import thyyxxk.webserver.entity.shitijian.TiJianPiPeiPojo;
+import thyyxxk.webserver.entity.shitijian.TiJianUploadInfosPojo;
+import thyyxxk.webserver.entity.shitijian.TiJianYuYuePojo;
+import thyyxxk.webserver.service.shitijian.SiTjService;
 
 import java.util.List;
 

src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -143,8 +143,8 @@ public interface TransferInOfExpensesDao {
      * 获取费用总和
      *
      * @param inpatientNo  住院号
-     * @param chargeCodeMX
-     * @return
+     * @param chargeCodeMX 项目编码
+     * @return 返回费用
      */
     @Select("<script>" +
             "select charge_fee,charge_amount,charge_code " +
@@ -181,11 +181,12 @@ public interface TransferInOfExpensesDao {
             "<foreach collection='list' item='fee' separator=',' open='' close=''>" +
             "(#{info.inpatientNo}, #{info.admissTimes}, #{info.ledgerSn}, #{fee.detailSn}, getDate(), #{info.staffId}, " +
             "#{fee.chargeCode}, 0, 2, #{fee.chargeAmount}, cast(#{fee.chargeFee,jdbcType=DECIMAL} as decimal(14,5)), #{info.ward}, #{info.dept}, 6, " +
-            "#{info.operation},getDate(), #{fee.chargeCodeMx},#{fee.serial},#{fee.doctorCode},0,#{info.referPhysician}," +
+            "'',getDate(), #{fee.chargeCodeMx},#{fee.serial},#{fee.doctorCode},0,#{info.referPhysician}," +
             "#{info.consultPhysician},#{info.reqExecUnit},#{info.zySerialNo})" +
             "</foreach>" +
             "</script>")
-    void insertInfoZyDetailCharge(@Param("info") ZyActpatient info, @Param("list") List<MzChargeDetail> zyFees);
+    void insertInfoZyDetailCharge(@Param("info") ZyActpatient info,
+                                  @Param("list") List<MzChargeDetail> zyFees);
 
     /**
      * 查询出这个患者的最大流水号，在新增费用的时候要加一

src/main/java/thyyxxk/webserver/entity/ShiTiJian/IllnessInfos.java → src/main/java/thyyxxk/webserver/entity/shitijian/IllnessInfos.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.entity.ShiTiJian;
+package thyyxxk.webserver.entity.shitijian;
 
 import lombok.Data;
 

src/main/java/thyyxxk/webserver/entity/ShiTiJian/IndexResultInfos.java → src/main/java/thyyxxk/webserver/entity/shitijian/IndexResultInfos.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.entity.ShiTiJian;
+package thyyxxk.webserver.entity.shitijian;
 
 import lombok.Data;
 

src/main/java/thyyxxk/webserver/entity/ShiTiJian/PackageInfo.java → src/main/java/thyyxxk/webserver/entity/shitijian/PackageInfo.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.entity.ShiTiJian;
+package thyyxxk.webserver.entity.shitijian;
 
 import lombok.Data;
 

src/main/java/thyyxxk/webserver/entity/ShiTiJian/TiJianPiPeiPojo.java → src/main/java/thyyxxk/webserver/entity/shitijian/TiJianPiPeiPojo.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.entity.ShiTiJian;
+package thyyxxk.webserver.entity.shitijian;
 
 import lombok.Data;
 

src/main/java/thyyxxk/webserver/entity/ShiTiJian/TiJianUploadInfosPojo.java → src/main/java/thyyxxk/webserver/entity/shitijian/TiJianUploadInfosPojo.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.entity.ShiTiJian;
+package thyyxxk.webserver.entity.shitijian;
 
 import lombok.Data;
 

src/main/java/thyyxxk/webserver/entity/ShiTiJian/TiJianYuYuePojo.java → src/main/java/thyyxxk/webserver/entity/shitijian/TiJianYuYuePojo.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.entity.ShiTiJian;
+package thyyxxk.webserver.entity.shitijian;
 
 import lombok.Data;
 

src/main/java/thyyxxk/webserver/service/querydata/huiZhenTongJiService.java

@@ -70,6 +70,12 @@ public class huiZhenTongJiService {
         return ResultVoUtil.successTable(page.getRecords(), page.getTotal());
     }
 
+    /**
+     * 导出会诊信息
+     *
+     * @param response 返回文件流
+     * @param param    查询的条件
+     */
     public void excel(HttpServletResponse response, JieShouHuiZhenPojo param) {
         log.info("导出会诊统计excel --> {}", JSON.toJSONString(param));
         List<JieShouHuiZhenPojo> list = getHuiZhenTongJiPage(param).getRecords();

src/main/java/thyyxxk/webserver/service/ShiTiJian/SiTjService.java → src/main/java/thyyxxk/webserver/service/shitijian/SiTjService.java

@@ -1,4 +1,4 @@
-package thyyxxk.webserver.service.ShiTiJian;
+package thyyxxk.webserver.service.shitijian;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.constants.sidicts.SiTj;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.ShiTiJian.TiJianPiPeiPojo;
-import thyyxxk.webserver.entity.ShiTiJian.TiJianUploadInfosPojo;
-import thyyxxk.webserver.entity.ShiTiJian.TiJianYuYuePojo;
+import thyyxxk.webserver.entity.shitijian.TiJianPiPeiPojo;
+import thyyxxk.webserver.entity.shitijian.TiJianUploadInfosPojo;
+import thyyxxk.webserver.entity.shitijian.TiJianYuYuePojo;
 import thyyxxk.webserver.utils.SiTjResTemplate;
 
 import java.util.List;