lighter преди 1 месец
родител
ревизия
3ae052f736

+ 7 - 0
src/main/java/thyyxxk/webserver/dao/his/inpatient/nursemodule/MobileNursingDao.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.entity.inpatient.nursemodule.mobilenursing.PickerOption;
+import thyyxxk.webserver.entity.medicaladvice.medicamanage.patientinfo.ZyBedMi;
 import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
 
 import java.util.List;
@@ -26,4 +27,10 @@ public interface MobileNursingDao {
     @Update("update ysh_yj_req set sample_status='1',sample_check_staff=#{user}," +
             "sample_check_time=getdate() where req_no=#{reqNo}")
     int updateSampleStatus(Integer reqNo, String user);
+
+    @Select("select rtrim(ward_code) as wardCode,rtrim(bed_no) as bedNo," +
+            "rtrim(inpatient_no) as inpatientNo, admiss_times, " +
+            "name=(select rtrim(z.name) from a_patient_mi z where z.inpatient_no=a.inpatient_no) " +
+            "from zy_bed_mi a where room_no=#{roomNo}")
+    List<ZyBedMi> getBedNosByRoomNo(String roomNo);
 }

+ 2 - 1
src/main/java/thyyxxk/webserver/entity/inpatient/nursemodule/mobilenursing/WardRoomNo.java

@@ -1,6 +1,7 @@
 package thyyxxk.webserver.entity.inpatient.nursemodule.mobilenursing;
 
 import lombok.Data;
+import thyyxxk.webserver.entity.inpatient.patient.Patient;
 
 import java.util.List;
 
@@ -13,5 +14,5 @@ public class WardRoomNo {
     // 病房名称
     private String wardName;
     // 房间床位
-    private List<String> bedNos;
+    private List<Patient> roomPatients;
 }

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/inpatient/nursemodule/mobilenursing/WardRounds.java

@@ -14,6 +14,9 @@ public class WardRounds {
     private String wardCode;
     private String wardName;
     private String bedNo;
+    private String patNo;
+    private Integer times;
+    private String patName;
     private String roundContent;
     private String staffId;
     private String staffName;

+ 20 - 8
src/main/java/thyyxxk/webserver/service/inpatient/nursemodule/MobileNursingService.java

@@ -14,6 +14,7 @@ import thyyxxk.webserver.entity.datamodify.YzTemperature;
 import thyyxxk.webserver.entity.dictionary.wxservice.ZdHealthEducation;
 import thyyxxk.webserver.entity.inpatient.nursemodule.mobilenursing.*;
 import thyyxxk.webserver.entity.inpatient.patient.Patient;
+import thyyxxk.webserver.entity.medicaladvice.medicamanage.patientinfo.ZyBedMi;
 import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
 import thyyxxk.webserver.service.hutoolcache.DeptCache;
 import thyyxxk.webserver.utils.DateUtil;
@@ -207,21 +208,32 @@ public class MobileNursingService {
     }
 
     public WardRoomNo getWardAndBeds(String roomNo) {
-        // todo 此处要替换为查询实际关联情况
+        List<ZyBedMi> zyBedMiList = dao.getBedNosByRoomNo(roomNo);
+        if (zyBedMiList == null || zyBedMiList.isEmpty()) {
+            throw new BizException(ExceptionEnum.NO_DATA_EXIST,
+                    "未查询到当前房间号【" + roomNo + "】所关联的病房信息!");
+        }
         WardRoomNo wardRoomNo = new WardRoomNo();
         wardRoomNo.setRoomNo(roomNo);
-        wardRoomNo.setWardCode("8000002");
-        wardRoomNo.setWardName("二病室");
-        List<String> bedNos = new ArrayList<>();
-        bedNos.add("01");
-        bedNos.add("02");
-        wardRoomNo.setBedNos(bedNos);
+        wardRoomNo.setWardCode(zyBedMiList.get(0).getWardCode());
+        wardRoomNo.setWardName(deptCache.getDeptName(wardRoomNo.getWardCode()));
+        List<Patient> roomPatients = new ArrayList<>();
+        for (ZyBedMi zyBedMi : zyBedMiList) {
+            Patient patient = new Patient();
+            patient.setBedNo(zyBedMi.getBedNo());
+            patient.setInpatientNo(zyBedMi.getInpatientNo());
+            patient.setAdmissTimes(zyBedMi.getAdmissTimes());
+            patient.setName(zyBedMi.getName());
+            roomPatients.add(patient);
+        }
+        wardRoomNo.setRoomPatients(roomPatients);
         return wardRoomNo;
     }
 
     public String saveWardRounds(List<WardRounds> list) {
         Date now = new Date();
-        list.removeIf(item -> StringUtil.isBlank(item.getRoundContent()));
+        list.removeIf(item -> StringUtil.isBlank(item.getPatNo())
+                || StringUtil.isBlank(item.getRoundContent()));
         for (WardRounds wardRounds : list) {
             wardRounds.setId(SnowFlakeId.instance().nextId());
             wardRounds.setCreateTime(now);

+ 4 - 0
update/2025-11-03.md

@@ -11,4 +11,8 @@ exec sp_rename 'zd_health_education.zd_health_education_sort_no_name_index', zd_
      'INDEX'
 go
 
+```
+
+```sql
+alter table ward_rounds add pat_no varchar(32) not null , times int  not null, pat_name nvarchar(32)  not null
 ```