Merge branch '2.0' of http://27.154.233.186:10080/Amoy2/wlyy2.0 into 2.0

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -4788,7 +4788,7 @@ public class ImService {
                    }
                } else {
                    sql += " AND  op.register_date >= '" + DateUtil.dateToStrShort(new Date()) + " 00:00:00' ";
//                    sql += " AND  op.register_date >= '" + DateUtil.dateToStrShort(new Date()) + " 00:00:00' ";//不加今日待办
                }
            }
            sql = sql + " AND op.type in ('1','2') AND op.outpatient_type = 3 ";

common/common-entity/src/db/2024.sql

@@ -78,7 +78,7 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('patient_lable_disease_type11', NULL, 'patient_lable_disease_type', '11', '其他疾病', NULL, '11', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '居民标签_疾病类型');
CREATE TABLE `wlyy_patient_label_log` (
     `id` int NOT NULL,
     `id` int NOT NULL AUTO_INCREMENT,,
     `patient` varchar(50) DEFAULT NULL,
     `doctor` varchar(50) DEFAULT NULL,
     `doctor_name` varchar(50) DEFAULT NULL,

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/LabelService.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -85,6 +86,7 @@ public class LabelService {
    }
    //保存居民标签
    @Transactional
    public void savePatientLabel(List<WlyyPatientLabelDO> labelDOS, String patient,String doctor) throws Exception{
        List<WlyyPatientLabelDO> patientLabelDOS = patientLabelDao.findByPatient(patient);
        Map<String,String> map = new HashMap<>();