Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/controller/medicalinsurance/SiZyController.java

@@ -92,4 +92,13 @@ public class SiZyController {
     public ResultVo<String> timeoutSettlement(@RequestBody ZyPatientInfo p) {
         return ResultVoUtil.success(service.timeoutSettlement(p));
     }
+
+    @PassToken
+    @GetMapping("/revokeSingleCharge")
+    public ResultVo<String> revokeSingleCharge(@RequestParam("patNo") String patNo,
+                                               @RequestParam("times") Integer times,
+                                               @RequestParam("ledgerSn") Integer ledgerSn,
+                                               @RequestParam("detailSn") Integer detailSn) {
+        return service.revokeSingleCharge(patNo, times, ledgerSn, detailSn);
+    }
 }

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiZyDao.java

@@ -210,6 +210,10 @@ public interface SiZyDao {
             "and admiss_times=#{times} and ledger_sn in (#{sn1}, #{sn2})")
     void updateTransFlag(String patNo, int times, int sn1, int sn2);
 
+    @Update("update zy_detail_charge set trans_flag_yb='0' where inpatient_no=#{patNo} " +
+            "and admiss_times=#{times} and detail_sn=#{sn}")
+    void updateTransFlagToZero(String patNo, int times, int sn);
+
     @Select("select code from zy_zd_responce_type where med_type=#{medtype} ")
     String selectResponceType(String medtype);
 

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiZyService.java

@@ -401,6 +401,7 @@ public class SiZyService {
             wrapper.eq("ledger_sn", ledgerSn);
             wrapper.eq("feedetl_sn", detailSn);
             chrgtmpdao.delete(wrapper);
+            dao.updateTransFlagToZero(patNo, times, detailSn);
         }
         return ResultVoUtil.success("处理成功。");
     }