Преглед на файлове

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx преди 3 години
родител
ревизия
7502f8acac
променени са 3 файла, в които са добавени 68 реда и са изтрити 61 реда
  1. 4 3
      controllers/sz/sz_his_api_controller.go
  2. 56 50
      models/drug.go
  3. 8 8
      service/sz_his_service.go

+ 4 - 3
controllers/sz/sz_his_api_controller.go Целия файл

@@ -273,6 +273,7 @@ func SZHisManagerApiRegistRouters() {
273 273
 	beego.Router("/sz/api/register/get", &SZHisApiController{}, "get:GetRegisterInfo")
274 274
 	//上传明细,预结算
275 275
 	//beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
276
+
276 277
 	//结算
277 278
 	beego.Router("/sz/api/settle/get", &SZHisApiController{}, "get:GetSettleInfo")
278 279
 
@@ -284,9 +285,10 @@ func SZHisManagerApiRegistRouters() {
284 285
 	beego.Router("sz/api/refundnumber/get", &SZHisApiController{}, "get:RefundNumber")
285 286
 
286 287
 	beego.Router("/sz/api/monthrefund/get", &SZHisApiController{}, "get:MonthRefund")
288
+
287 289
 	//查询交易
288 290
 	beego.Router("/sz/api/settle/query", &SZHisApiController{}, "get:GetSettleAccounts")
289
-	//撤销明细
291
+	beego.Router("/sz/api/detail/upload", &SZHisApiController{}, "get:GetUploadDetail")
290 292
 	beego.Router("/sz/api/detail/cancel", &SZHisApiController{}, "get:CancelOrderDetail")
291 293
 	//
292 294
 	////机构药品目录备案
@@ -2829,10 +2831,9 @@ func (c *SZHisApiController) Refund() {
2829 2831
 						Status:     1,
2830 2832
 						PatientId:  patient_id,
2831 2833
 						RecordTime: recordDateTime,
2832
-						Stage:      11,
2834
+						Stage:      6,
2833 2835
 					}
2834 2836
 					service.CreateErrMsgLog(errlog)
2835
-
2836 2837
 					c.ServeSuccessJSON(map[string]interface{}{
2837 2838
 						"faild_code": -10,
2838 2839
 						"msg":        res.Transreturnmessage,

+ 56 - 50
models/drug.go Целия файл

@@ -1,56 +1,62 @@
1 1
 package models
2 2
 
3 3
 type BaseDrugLib struct {
4
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
5
-	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
6
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
7
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
8
-	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
9
-	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
10
-	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
11
-	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
12
-	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
13
-	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
14
-	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
15
-	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
16
-	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
17
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
18
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
19
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
20
-	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
21
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
22
-	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
23
-	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
24
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
25
-	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
26
-	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
27
-	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
28
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
29
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
30
-	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
31
-	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
32
-	Code                   string  `gorm:"column:code" json:"code" form:"code"`
33
-	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
34
-	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
35
-	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
36
-	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
37
-	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
38
-	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
39
-	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
40
-	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
41
-	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
42
-	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
43
-	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
44
-	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
45
-	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
46
-	IsChargePredict        int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
47
-	IsStatisticsWork       int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
48
-	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
49
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
50
-	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
51
-	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
52
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
53
-	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
4
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
5
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
6
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
7
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
8
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
9
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
10
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
11
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
12
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
13
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
14
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
15
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
16
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
17
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
18
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
19
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
20
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
21
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
22
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
23
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
24
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
25
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
26
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
27
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
28
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
29
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
30
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
31
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
32
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
33
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
34
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
35
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
36
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
37
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
38
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
39
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
40
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
41
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
42
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
43
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
44
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
45
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
46
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
47
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
48
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
49
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
50
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
51
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
52
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
53
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
54
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
55
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
56
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
57
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
58
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
59
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
54 60
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
55 61
 }
56 62
 

+ 8 - 8
service/sz_his_service.go Целия файл

@@ -710,14 +710,14 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
710 710
 	inputMessage["extendDeviceId"] = ""
711 711
 	inputMessage["extendSerialNumber"] = ""
712 712
 	inputMessage["extendUserId"] = ""
713
-	inputMessage["hospitalCode"] = "G5540"     // 协议机构编码
714
-	inputMessage["operatorCode"] = doctor_code // 操作员编码
715
-	inputMessage["operatorName"] = doctor      // 操作员名字
716
-	inputMessage["operatorPass"] = ""          // 定点协议机构操作人员编码
717
-	//inputMessage["serialNumber"] = "G5540" + year + month + day +
718
-	//  fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码(5位)+日期(8位)+流水号(7位)
719
-	inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码(5位)+日期(8位)+流水号(7位)
720
-	inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
713
+	inputMessage["hospitalCode"] = fixmedins_code // 协议机构编码
714
+	inputMessage["operatorCode"] = doctor_code    // 操作员编码
715
+	inputMessage["operatorName"] = doctor         // 操作员名字
716
+	inputMessage["operatorPass"] = ""             // 定点协议机构操作人员编码
717
+	inputMessage["serialNumber"] = fixmedins_code + year + month + day +
718
+		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码(5位)+日期(8位)+流水号(7位)
719
+	//inputMessage["serialNumber"] = "G554020210406" + fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码(5位)+日期(8位)+流水号(7位)
720
+	//inputMessage["verifyCode"] = "000000|8ec5b7745a5cc45b631f23b4bf1e417e"
721 721
 
722 722
 	inputMessage["transReturnCode"] = ""                                           //
723 723
 	inputMessage["transReturnMessage"] = ""                                        //