Browse Source

Merge branch 'release/5.12.6' of 192.168.2.80:/srv/git/pre_api into release/5.12.6

zjh 2 years ago
parent
commit
6a56c4a919

BIN
cbkj_web_api/src/main/java/com/jiuzhekan/cbkj/controller/statistics/vo/PrescriptionStatisticsVO.java


BIN
cbkj_web_api/src/main/java/com/jiuzhekan/cbkj/service/business/treatment/TreatmentService.java


+ 25 - 0
cbkj_web_api/src/main/resources/ReadMe.md

@@ -6,6 +6,31 @@ config/application.properties 为后端配置文件
 application.properties中的数据库用户名密码加密方式:请求"http://118.31.103.138:83/pre_ai/noAuth/encrypt?val=你的用户名",把返回值填入spring.datasource.primary.username,密码同理
 ```
 
+### 5.12.6
+`date:2022.01.24`
+
+- 1414 中医知识库-增加我的收藏入口
+- 1415 中医知识库-增加“经方查询”模块	
+- 1416 中医知识库详情页收藏后返回,收藏状态显示优化	
+- 1417 增加处方状态:药房审核通过、药房审核未通过	
+- 1418 临床业务监管平台-增加“处方分析(新都)”
+- 1419 临床业务监管平台-处方金额分析,增加导出报表	
+- 1420 临床业务监管平台-中药处方选择统计-增加列表展示及报表导出
+- 1421 智能开方-推导出“扩充”的诊断,红色提醒,限制是否强制保存
+  ```text
+  新增参数:
+  参数名称:诊断范围验证(扩充诊断)
+  参数代码:DIAGNOSIS_RANGE_VERIFY
+  参数说明:扩充诊断(95标准 或 95修订之外)是否强制限制保存
+      0:表示无限制(默认)
+      1:表示限制
+  ```
+- 1422 增加参数分类管理及参数编号
+- 1423 导出报表名称优化
+- 1424 舌诊、脉诊收藏功能优化
+- 1427 配方颗粒开方时无需判断明细库存
+
+
 ### 5.12.5
 `date:2022.01.04`
 - KFXT-880 华润德信行大药房项目蓝色调主题

+ 2 - 0
cbkj_web_api/src/main/resources/mappers/statistics/PrescriptionStatisticsMapper.xml

@@ -14,6 +14,7 @@
         <result column="REC_GENDER" jdbcType="VARCHAR" property="patientGender"/>
         <result column="REC_AGE" jdbcType="VARCHAR" property="patientAge"/>
         <result column="PRE_TIME" jdbcType="VARCHAR" property="preTime"/>
+        <result column="REC_ID" jdbcType="VARCHAR" property="recId"/>
         <result column="PRE_ID" jdbcType="VARCHAR" property="preId"/>
         <result column="PRE_NO" jdbcType="VARCHAR" property="preNo"/>
         <result column="DIS_ID" jdbcType="VARCHAR" property="disId"/>
@@ -64,6 +65,7 @@
         case r.REC_GENDER when 'F' then '女' when 'M' then '男' end REC_GENDER,
         concat(r.REC_AGE1, r.REC_AGEUNIT1, r.REC_AGE2, r.REC_AGEUNIT2) REC_AGE,
         date_format(p.PRE_TIME, '%Y-%m-%d %H:%i:%s') PRE_TIME,
+        p.REC_ID,
         p.PRE_ID,
         p.PRE_NO,
         r.DIS_ID,

+ 14 - 2
cbkj_web_api/src/main/resources/sqlRecord/pre_api_v5.12.6.sql

@@ -4,8 +4,11 @@ ALTER TABLE `t_doctor_collect`
 -- 2022-01-14 zjh 增加两个字段:参数分类、参数编号
 ALTER TABLE `t_sys_param` ADD COLUMN `PAR_CLASSIFY` VARCHAR (256) NULL COMMENT '参数分类' AFTER `SEQN`,ADD COLUMN `PAR_NUMBER` VARCHAR (256) NULL COMMENT '参数编号' AFTER `PAR_CLASSIFY`;
 
+#2022-01-19 guowei 新增参数:诊断范围验证(扩充诊断)
+INSERT INTO `t_sys_param` (`PAR_ID`, `APP_ID`, `INS_CODE`, `DEPT_ID`, `PAR_CODE`, `PAR_NAME`, `PAR_VALUES`, `PAR_DES`, `CREATE_DATE`, `CREATE_USER`, `CREATE_USERNAME`, `UPDATE_DATE`, `UPDATE_USER`, `UPDATE_USERNAME`, `DEL_DATE`, `DEL_USER`, `DEL_USERNAME`, `IS_DEL`, `SEQN`, `PAR_CLASSIFY`, `PAR_NUMBER`) VALUES('fa94ad69cf354a3592a8f53e98d7c89c','000000','000000','000000','DIAGNOSIS_RANGE_VERIFY','诊断范围验证(扩充诊断)','1','扩充诊断(95标准 或 95修订之外)是否强制限制保存\n    0:表示无限制(默认)\n    1:表示限制','2022-01-11 13:47:49','70810c874405453b99c6c2cf72296fe5','管理员',NULL,NULL,NULL,NULL,NULL,NULL,'0','-1',NULL,NULL);
 
-#2022-.1-19 guowei 批量处理‘参数分类’‘参数编号’
+
+#2022-01-19 guowei 批量处理‘参数分类’‘参数编号’
 update t_sys_param set PAR_NUMBER = 'A001', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'FIRST_DIAGNOSIS_FUNCTION';
 update t_sys_param set PAR_NUMBER = 'A002', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'DIALECTICAL_TAB';
 update t_sys_param set PAR_NUMBER = 'A003', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'MASTER_DISEASE';
@@ -75,6 +78,8 @@ update t_sys_param set PAR_NUMBER = 'A066', PAR_CLASSIFY = '智能开方' where
 update t_sys_param set PAR_NUMBER = 'A067', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'SYS_CHECK_DAILY_MAX_DOSE';
 update t_sys_param set PAR_NUMBER = 'A068', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'UPDATE_PRE_DEL_OLD';
 update t_sys_param set PAR_NUMBER = 'A069', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'VALID_PRESCRIPTION_TYPE';
+update t_sys_param set PAR_NUMBER = 'A070', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'DIAGNOSIS_RANGE_VERIFY';
+update t_sys_param set PAR_NUMBER = 'A071', PAR_CLASSIFY = '智能开方' where PAR_CODE = 'PRESCRIPTION_SPECIAL_DISEASE_RANGE_PICKER_DISABLED_OPTIONS';
 update t_sys_param set PAR_NUMBER = 'B001', PAR_CLASSIFY = '药品目录' where PAR_CODE = 'CENTER_DRUG_MAPPING_STRATEGY';
 update t_sys_param set PAR_NUMBER = 'C001', PAR_CLASSIFY = '安全合理用药' where PAR_CODE = 'CHECK_OR_NOT';
 update t_sys_param set PAR_NUMBER = 'C002', PAR_CLASSIFY = '安全合理用药' where PAR_CODE = 'CHECK_OR_NOT_BY_SYS';
@@ -111,4 +116,11 @@ update t_sys_param set PAR_NUMBER = 'J001', PAR_CLASSIFY = '电子病历' where
 update t_sys_param set PAR_NUMBER = 'J002', PAR_CLASSIFY = '电子病历' where PAR_CODE = 'PRINT_RECORD_SHOW';
 update t_sys_param set PAR_NUMBER = 'J003', PAR_CLASSIFY = '电子病历' where PAR_CODE = 'RECORD_MUST_SAVE';
 update t_sys_param set PAR_NUMBER = 'J004', PAR_CLASSIFY = '电子病历' where PAR_CODE = 'REC_PDF_TEMPLATE';
-update t_sys_param set PAR_NUMBER = 'J005', PAR_CLASSIFY = '电子病历' where PAR_CODE = 'TRANSFER_RECORD_SHOW';
+update t_sys_param set PAR_NUMBER = 'J005', PAR_CLASSIFY = '电子病历' where PAR_CODE = 'TRANSFER_RECORD_SHOW';
+
+#2022.1.24 gw 增加我的收藏菜单
+insert into `sys_admin_menu` (`mid`, `mname`, `url`, `path`, `iconCls`, `enabled`, `parent_mid`, `create_date`, `cteate_id`, `menu_type`, `btn_class`, `btn_type`, `btn_weight`, `sort_number`, `btn_level`, `open_type`) values('219','我的收藏','/study/my-favorite',NULL,NULL,'2','182','2022-01-11 09:38:59','70810c874405453b99c6c2cf72296fe5','2',NULL,NULL,NULL,'12',NULL,'1');
+#2022.1.24 gw 增加经方查询菜单
+INSERT INTO `sys_admin_menu` (`mid`, `mname`, `url`, `path`, `iconCls`, `enabled`, `parent_mid`, `create_date`, `cteate_id`, `menu_type`, `btn_class`, `btn_type`, `btn_weight`, `sort_number`, `btn_level`, `open_type`) VALUES('220','经方查询','/study/classical',NULL,NULL,'2','182','2022-01-11 15:40:21','70810c874405453b99c6c2cf72296fe5','2',NULL,NULL,NULL,'0',NULL,'1');
+#2022.1.24 gw 增加处方分析(新都)菜单
+INSERT INTO `sys_admin_menu` (`mid`, `mname`, `url`, `path`, `iconCls`, `enabled`, `parent_mid`, `create_date`, `cteate_id`, `menu_type`, `btn_class`, `btn_type`, `btn_weight`, `sort_number`, `btn_level`, `open_type`) VALUES('221','处方分析(新都)','/statistical/p&m',NULL,NULL,'2','14','2022-01-24 10:40:21','70810c874405453b99c6c2cf72296fe5','2',NULL,NULL,NULL,'0',NULL,'1');

BIN
cbkj_web_api/src/main/resources/templates/recordTemplateA4.pdf


BIN
cbkj_web_api/src/main/resources/templates/recordTemplateA5.pdf