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

conf/app.conf

@@ -157,6 +157,7 @@ front_end_domain = "http://xt.test.sgjyun.com/#"
 org_id = 4
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
+
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 #gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #gdyb_paasid = "test_sz"

controllers/sz/sz_his_api_controller.go

@@ -2182,6 +2182,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
 	//tempOrder, _ := service.GetNewHisOrderThree(or)
+
 	tempOrder, _ := service.GetHisOrderByID(order_id)
 
 	if tempOrder.ID == 0 {

service/his_service.go

@@ -725,8 +725,8 @@ func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
 
 func UpdataRegStatusTwo(his_patient_id int64, record_time int64, org_id int64) {
 	writeDb.Model(&models.HisPatient{}).Where("status = 1 AND record_date =? AND user_org_id = ? AND id = ?", record_time, org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
-	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
-	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"his_patient_id": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"his_patient_id": 0, "mtime": time.Now().Unix()})
 
 }
 
@@ -1203,8 +1203,8 @@ func GetAllPatient(org_id int64) (patients []*models.Patients, err error) {
 }
 
 func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
-	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
-	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
 	return
 }
 

service/sz_his_service.go

@@ -780,12 +780,17 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 }
 
 func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *models.MyHisProject) string {
-	timeLayout := "20060102"
-	record_date := time.Unix(pro.RecordDate, 0).Format(timeLayout)
-	recordDate, _ := strconv.ParseInt(record_date, 10, 64)
+	//timeLayout := "20060102"
+	//record_date := time.Unix(pro.RecordDate, 0).Format(timeLayout)
+	//recordDate, _ := strconv.ParseInt(record_date, 10, 64)
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+
 	inputData := make(map[string]interface{})
 	inputData["listsize"] = 1
 	inputMessage["transType"] = "ML009" // 交易编码
@@ -798,7 +803,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
 	feedetailInfo["bkf131"] = pro.Category                              //协议机构项目类别
 	feedetailInfo["bkm062"] = strconv.FormatInt(pro.SpecailProject, 10) // 门诊特检项目标识
 	feedetailInfo["bka506"] = pro.Price                                 // 协议机构内部项目收费价格
-	feedetailInfo["aae030"] = recordDate                                // 备案日期
+	feedetailInfo["aae030"] = year + month + day                        // 备案日期
 	feedetailInfo["aae013"] = pro.Remark                                // 备注
 	feedetail = append(feedetail, feedetailInfo)
 
@@ -1439,8 +1444,8 @@ func UpdataOrderStatusSZ(id int64, number string, user_org_id int64) (err error)
 
 func UpdataHisStatusSZ(user_org_id int64, his_mz_number string, his_number string, result string, his_patient_id int64) (err error) {
 	err = writeDb.Model(&models.HisPatient{}).Where("status = 1 AND user_org_id = ? AND mz_number = ? AND number = ?", user_org_id, his_mz_number, his_number).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "refund_detail": result}).Error
-	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", user_org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
-	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", user_org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", user_org_id, his_patient_id).Updates(map[string]interface{}{"his_patient_id": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", user_org_id, his_patient_id).Updates(map[string]interface{}{"his_patient_id": 0, "mtime": time.Now().Unix()})
 	return
 }