common/common-entity/sql记录.txt

@@ -1688,6 +1688,30 @@ alter table t_mediicine_order add column reviewer_doctor_name varchar(255) defau
 alter table base_ylz_medical_relation add column equ_num varchar(100) DEFAULT NULL COMMENT '设备号';
 --2025-01-10
 CREATE TABLE `t_medicine_patient_log` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `equ_num` varchar(50) DEFAULT NULL COMMENT '设备编号',
   `org_code` varchar(50) DEFAULT NULL COMMENT '机构编码',
   `method_type` varchar(50) DEFAULT NULL COMMENT '业务类型',
   `method_url` varchar(500) DEFAULT NULL COMMENT '请求url',
   `method_name` varchar(50) DEFAULT NULL,
   `card_no` varchar(50) DEFAULT NULL COMMENT '卡号',
   `idcard` varchar(50) DEFAULT NULL COMMENT '身份证',
   `name` varchar(50) DEFAULT NULL,
   `req` text COMMENT '请求参数',
   `res` text COMMENT '返回内容',
   `status` tinyint(1) DEFAULT NULL COMMENT '状态1成功 0失败',
   `error` text COMMENT '错误内容',
   `req_time` int(11) DEFAULT NULL COMMENT '请求时长毫秒',
   `create_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `index1` (`equ_num`,`org_code`),
   KEY `index2` (`card_no`,`idcard`,`name`),
   KEY `index3` (`method_type`,`create_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药柜居民请求日志';
 ALTER TABLE `base`.`advertisement_putting_admin`
 ADD COLUMN `publish_location` int(11) NULL COMMENT '发布位置（0广告位、1banner位、2动态列表）' AFTER `title`,
 ADD COLUMN `sort` int(11) NULL COMMENT '排序' AFTER `forbidden`;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedevice.java

@@ -7,6 +7,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -245,6 +246,8 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator{
     */
    private String modules;
    private String faultState;//是否故障
    public String getModules() {
        return modules;
    }
@@ -626,4 +629,13 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator{
    public void setLogTime(Date logTime) {
        this.logTime = logTime;
    }
    @Transient
    public String getFaultState() {
        return faultState;
    }
    public void setFaultState(String faultState) {
        this.faultState = faultState;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderEndpoint.java

@@ -271,7 +271,7 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
        return success(result.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseOrder.export)
    @PostMapping(value = "excelControl/export")
    @ApiOperation(value = "处方订单列表导出" , notes="处方订单列表导出")
    @ResponseBody
    public void export(

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -1994,6 +1994,15 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        String sqlFaultState = "select count(id) from t_mediicinecabinet_inventory where id_device='"+deviceId+"' and fault_state=1";
        int count = jdbcTemplate.queryForObject(sqlFaultState,Integer.class);
        if(count>0){
            device.setFaultState("是");
        }else {
            device.setFaultState("否");
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("device",device);
        //货道总数----->行*列计算得出货道总数