Merge branch 'main' of http://123.57.244.246:3000/Flow/inspect-backend

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java

@@ -588,6 +588,12 @@ public class InspectPatientController {
                                 ReportData reportData = reportResponse.getData();
                                 // 获取 reportPath
                                 String reportPath = reportData.getReportPath();
+                                String barCodestatus=reportData.getBarCodestatus();
+                                //更新检验检查状态
+                                if (barCodestatus!=null) {
+                                    pacsDataService.updatebarcodestatus(medicalSn, model, barCodestatus);
+                                }
+
                                 if (!reportPath.contains("报告暂未出")) {
                                     StringBuilder sb = new StringBuilder();
                                     InspectPacsDataSaveReqVO inspectPacs = new InspectPacsDataSaveReqVO();

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/ReportData.java

@@ -7,6 +7,7 @@ import java.util.List;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ReportData {
+    private String barCodestatus;
     private String reportPath;
     private List<ResultItem> results;
     private List<ResultItem> resultsAll;

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataService.java

@@ -44,6 +44,10 @@ public interface InspectPacsDataService {
     * 根据体检编号更新pacsdata表的item字段
     * */
     void updatePacsDataitem(InspectPacsDataSaveReqVO updateReqVO);
+    /*
+    * 更新检验检查的状态
+    * */
+    void updatebarcodestatus(String medicalSn, String type, String barcodestatus);
 
     /**
      * 获得pacs抓取数据

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpacsdata/InspectPacsDataServiceImpl.java

@@ -71,6 +71,14 @@ public class InspectPacsDataServiceImpl implements InspectPacsDataService {
                 .set(InspectPacsDataDO::getItem, updateReqVO.getItem());
         pacsDataMapper.update(null, updateWrapper);
     }
+    @Override
+    public void updatebarcodestatus(String medicalSn, String type, String barcodestatus) {
+        LambdaUpdateWrapper<InspectPacsDataDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(InspectPacsDataDO::getCode, medicalSn)
+                .eq(InspectPacsDataDO::getType, type)
+                .set(InspectPacsDataDO::getRemark, barcodestatus);
+        pacsDataMapper.update(null, updateWrapper);
+    }
     private void validatePacsDataExists(Integer id) {
         if (pacsDataMapper.selectById(id) == null) {
 

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java

@@ -145,6 +145,8 @@ public class InspectPatientServiceImpl implements InspectPatientService {
                 .set(InspectPatientDO::getShortid, shortid);
         patientMapper.update(null, updateWrapper);
     }
+
+
     @Override
     public void deletePatient(Integer id) {
         // 校验存在