提交代码

conf/接口.txt

@@ -1,115 +0,0 @@
-
-//新增临时
-/m/api/dialysis/dialysisPrescription?mode=1
-修改临处
-/m/api/dialysis/dialysisPrescription?mode=2
-修改他人临处
-/m/api/dialysis/dialysisPrescription?mode=3
-
-
-新增接诊评估
-/m/api/dialysis/acceptsAssessment?mode=1
-修改接诊评估
-/m/api/dialysis/acceptsAssessment?mode=2
-修改他人接诊评估
-/m/api/dialysis/acceptsAssessment?mode=3
-
-新增透前评估
-/m/api/assessmentbefore/commit?mode=1
-修改透前评估
-/m/api/assessmentbefore/commit?mode=2
-修改他人透前评估
-/m/api/assessmentbefore/commit?mode=3
-
-执行上机
-/m/api/dialysis/start?mode=1
-修改执行上机
-/m/api/startOrder/edit?mode=2
-修改他人执行上机
-/m/api/startOrder/edit?mode=3
-
-新增透析监测
-/m/api/monitor/add?mode=1
-修改透析监测
-/m/api/monitor/edit?mode=2
-修改他人透析监测
-/m/api/monitor/edit?mode=3
-删除透析监测
-/m/api/monitor/delete?mode=4
-删除他人透析监测
-/m/api/monitor/delete?mode=5
-
-执行下机
-/m/api/dialysis/finish?mode=1
-修改执行下机
-/m/api/finishOrder/edit?mode=2
-修改他人执行下机
-/m/api/finishOrder/edit?mode=3
-
-新增透后评估
-/m/api/dialysis/assessmentAfterDislysis?mode=1
-修改透后评估
-/m/api/dialysis/assessmentAfterDislysis?mode=2
-修改他人透后评估
-/m/api/dialysis/assessmentAfterDislysis?mode=3
-
-新增治疗小结
-/m/api/dialysis/treatmentSummary?mode=1
-修改治疗小结
-/m/api/dialysis/treatmentSummary?mode=2
-修改他人治疗小结
-/m/api/dialysis/treatmentSummary?mode=3
-
-新增透析临时医嘱
-/m/api/advice/creategroup?mode=1
-修改透析临时医嘱
-/m/api/advice/edit?mode=2
-修改他人透析临时医嘱
-/m/api/advice/edit?mode=3
-删除透析临时医嘱
-/m/api/newadvice/delete?mode=4
-删除他人透析临时医嘱
-/m/api/newadvice/delete?mode=5
-执行透析临时医嘱
-/m/api/advice/exec?mode=6
-核对透析临时医嘱
-/m/api/advice/check?mode=7
-修改已执行医嘱
-/m/api/advice/exec/modify?mode=8
-
-
-移动端 ： /m/api/permission/get      get 请求
-参数1: create_url
-参数2:modify_url
-
-参数3:modify_other_url
-
-参数4:del_url
-
-参数5:del_other_url
-
-参数6:exce_url
-
-参数7:check_url
-
-参数8:modify_exce_url
-参数9:module
-
-返回值1:is_has_create
-返回值2:is_has_modify
-
-返回值3:is_has_modify_other
-
-返回值4:is_has_del
-
-返回值5:is_has_del_other
-
-返回值6:is_has_exce
-
-返回值7:is_has_check
-
-返回值8:is_has_modify_exce
-
-返回值9:module
-
-

conf/源生堂导出sql.txt

@@ -0,0 +1,34 @@
+SELECT
+ his_order.psn_name AS '姓名',
+ count(his_order.id) AS '次数',
+ sum(his_order.medfee_sumamt) AS '医疗费总额',
+ sum(his_order.fund_pay_sumamt) AS '基金支付金额',
+ sum(his_order.acct_pay) AS '个人账户支付',
+ sum(his_order.psn_cash_pay) AS '个人支付金额',
+ sum(his_order.hifp_pay) AS '基金统筹支付金额',
+ sum(his_order.hifob_pay) AS '大额基金支付金额',
+ sum(his_order.maf_pay) AS '医疗救助基金',
+ sum(his_order.hifes_pay) AS '企业补充医疗保险基金支出',
+ sum(his_order.hifmi_pay) AS '居民大病基金支出',
+ sum(his_order.medfee_sumamt) AS '费用总额',
+ sum(his_order.fulamt_ownpay_amt) AS '全自费总额',
+ sum(his_order.overlmt_self_pay) AS '超限价自费费用',
+ sum(his_order.preselfpay_amt) AS '先行自付费用',
+ sum(his_order.psn_part_amt) AS '个人负担',
+ sum(his_order.acct_pay) AS '个人账户支出',
+ sum(his_order.psn_cash_pay) AS '个人现金支出',
+ sum(his_order.hosp_part_amt) AS '医院负担金额',
+ sum(his_order.acct_mulaid_pay) AS '个人账户共计支付',
+sum(his_order.oth_pay) AS '其他支付'
+FROM
+ his_order
+WHERE
+ his_order.user_org_id = 10088
+ AND his_order.order_status = 2
+ AND his_order.setl_time >= '2023-01-01 00:00:00'
+ AND his_order.setl_time <= '2023-01-31 23:59:59'
+ AND his_order.STATUS = 1
+GROUP BY
+ his_order.patient_id
+
+

service/pharmacy_service.go

@@ -1611,7 +1611,7 @@ func ProjectConsumables2T(orgid int64) (list []*models.DropDownList, err error)
 	for _, v := range good {
 		list = append(list, &models.DropDownList{
 			Id:   "i" + config.ToString(v.ID),
-			Name: v.GoodName + " " + v.SpecificationName,
+			Name: v.GoodName + " " + v.SpecificationName + " " + v.GoodNumber,
 		})
 	}