add

记录最后一次密码修改时间

nb-admin/src/test/java/com/nb/admin/IotTest.java

@@ -3,7 +3,10 @@ package com.nb.admin;
 import cn.hutool.json.JSONUtil;
 import com.nb.aliyun.controller.IotController;
 import com.nb.core.result.R;
+import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.api.entity.common.BusDeviceRunningEntity;
+import com.nb.web.service.bus.hospital.HospitalManager;
+import com.nb.web.service.bus.hospital.HospitalManagerRegister;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,14 +25,15 @@ public class IotTest {
     @Autowired
     private IotController iotController;
 
+    @Autowired
+    private HospitalManagerRegister managerRegister;
 
     @Test
     public void test001(){
-        String str="{\"firstDose\":0,\"type\":\"intelligent\",\"deviceId\":\"4310704330480294\",\"newInfusion\":false,\"flowRestricted\":false,\"totalDose\":100,\"pcaInvalidCount\":0,\"selfControlLockTime\":5,\"alarm\":\"None\",\"pcaValidCount\":0,\"patientCode\":\"333000000\",\"infusionModify\":false,\"maybeLowInfusion\":false,\"appendDose\":0,\"test\":false,\"resetClinic\":false,\"maxDose\":90,\"continueDose\":45,\"classification\":\"1\",\"inputDose\":3.6,\"electricQuantity\":100,\"resetUndo\":false,\"dataNumber\":20,\"runState\":\"Running\",\"pcaTotalCount\":0}";
-        BusDeviceRunningEntity obj = JSONUtil.toBean(str, BusDeviceRunningEntity.class);
-        R r = iotController.dataSave(obj);
-        while (true){
-
-        }
+        HospitalManager hospitalManager = managerRegister.get("1");
+        BusClinicEntity handle = hospitalManager.getScriptSession().handle("123",
+                "[{\"BEDNO\":\"033\",\"TELEPHONE\":\"18611511423\",\"TBSJ\":null,\"ANESTHESIAMODE\":\"复合麻醉\",\"SEX\":\"女\",\"EASEMODE\":\"PCIA\",\"BIRTHDATE\":\"1954-10-05T00:00:00\",\"HEIGHT\":\"161\",\"FORMULA\":\"氢吗啡酮10mg、地佐辛15mg、赛格恩10mg加盐水至250ml\",\"NAME\":\"李惠燕\",\"ASA\":\"Ⅲ\",\"WARD\":\"0000521\",\"OPERATION\":\"机器人辅助胃癌根治术\",\"ADDRESS\":\"文龙家园二里2-3-601\",\"SURGEON\":\"陈凛\",\"CONFIGPERSON\":null,\"PATIENT_ID\":\"Z100163028900\",\"WEIGHT\":\"66\",\"OPERATIONTIME\":\"2025-12-23T08:58:00\",\"PATIENTCODE\":\"8101126875\",\"DOCTOR\":\"蔡俊刚\",\"AGE\":71,\"TBSJ\":\"2025-10-21 09:00:00\"}]",
+                "8101126875");
+        while (true){}
     }
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/BusClinicEntity.java

@@ -186,7 +186,6 @@ public class BusClinicEntity extends TenantGenericEntity<String,String> {
     private String lastBadEval;
 
     @TableField(exist = false)
-    @JsonIgnore
     private Date finishTime;
 
     public String getWeight() {

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisScriptSession.java

@@ -242,6 +242,7 @@ public class HisScriptSession {
         try {
             result = exec.getIfSuccess();
             sources= JSONUtil.toList(result.toString(), BusClinicEntity.class);
+            log.info("数据解析结果：{}", JSONUtil.toJsonStr(sources));
         }catch (Exception e){
             if(exec.getException()==null){
                 exec.setMessage(ExceptionUtil.getExceptionMsg(e));

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/all/MoreToLessHisStrategyHandler.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.bus.hospital.his.strategy.all;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.service.bus.service.LocalBusClinicService;
@@ -71,7 +72,11 @@ public class MoreToLessHisStrategyHandler implements HisAllStrategyHandler {
                     clinic.setEndTime(insert.get(i-1).getStartTime());
                     clinic.setFinished(true);
                 }else {
-                    clinic.setFinished(false);
+                    if(ObjectUtil.isNotNull(clinic.getFinishTime())){
+                        clinic.setFinished(Boolean.TRUE);
+                    }else {
+                        clinic.setFinished(Boolean.FALSE);
+                    }
                 }
                 insert.get(i).setMonitorType(true);
             }

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/strategy/part/DefaultHisPartStrategyHandler.java

@@ -1,6 +1,7 @@
 package com.nb.web.service.bus.hospital.his.strategy.part;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.nb.core.utils.DateCompareUtil;
@@ -126,6 +127,9 @@ public class DefaultHisPartStrategyHandler implements HisStrategyHandler {
         for (int i = 0; i < source.size(); i++) {
             BusClinicEntity clinic = source.get(i);
             clinic.setFinished(i!=0);
+            if(!Boolean.TRUE.equals(clinic.getFinished())&& ObjectUtil.isNotNull(clinic.getEndTime())){
+                clinic.setFinished(Boolean.TRUE);
+            }
             clinicService.insertFromHis(clinic);
         }
         clinicService.setCurrentClinicByHis(CollUtil.getFirst(source.iterator()));

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusClinicService.java

@@ -204,6 +204,11 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
         if(source.getStartTime()!=null&&!DateCompareUtil.isSameDateTimeIgnoreMillis(source.getStartTime(),target.getStartTime())){
             infusionHistoryService.adjustInfusionByClinic(source.getId(),source.getPatientId(),source.getTenantId(),source.getStartTime());
         }
+        if(StrUtil.isNotEmpty(source.getId())&&ObjectUtil.isNotNull(source.getFinishTime())){
+            this.update(new UpdateWrapper<BusClinicEntity>().lambda().eq(BusClinicEntity::getId,source.getId())
+                    .set(BusClinicEntity::getFinished,Boolean.TRUE));
+
+        }
     }
 
 
@@ -250,7 +255,6 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
                 .eq(BusPatientEntity::getCode,source.getPatientCode())
                 .eq(BusPatientEntity::getTenantId,source.getTenantId())
                 .set(BusPatientEntity::getClinicId,source.getId()));
-
         //处理
         List<BusClinicEntity> clinics = this.list(new QueryWrapper<BusClinicEntity>().lambda()
                 .eq(BusClinicEntity::getPatientCode, source.getPatientCode())