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

controllers/sg/his_api_controller.go

@@ -1805,11 +1805,11 @@ func (c *HisApiController) GetBatchSettleList() {
 		tempFunPays = append(tempFunPays, tempFunPay610100)
 		struct4101.CustomStruct = tempFunPays
 
-		var tempOpspdiseinfos []service.OpspdiseinfoStruct
+		var tempDiaginfos []service.DiaginfoStructTwo
 		var tempOpspdiseinfo2 service.OpspdiseinfoStruct
-		//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+		var tempOpspdiseinfos []service.OpspdiseinfoStruct
 
-		diagnosis_ids := strings.Split(his.Diagnosis, ",")
+		diagnosis_ids := strings.Split(order.Diagnosis, ",")
 		var config []*models.HisXtDiagnoseConfig
 		for _, item := range diagnosis_ids {
 			id, _ := strconv.ParseInt(item, 10, 64)
@@ -1818,19 +1818,26 @@ func (c *HisApiController) GetBatchSettleList() {
 		}
 
 		for index, item := range config {
-			var tempOpspdiseinfo service.OpspdiseinfoStruct
-			tempOpspdiseinfo.DiagCode = item.CountryCode
-			tempOpspdiseinfo.DiagName = item.CountryContentName
-			tempOpspdiseinfo.MaindiagFlag = strconv.Itoa(index)
-			tempOpspdiseinfo.OprnOprtCode = ""
-			tempOpspdiseinfo.OprnOprtName = ""
-			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
-		}
+			if index == 0 {
+				var tempDiaginfo service.DiaginfoStructTwo
+				tempDiaginfo.DiagCode = item.CountryCode
+				tempDiaginfo.DiagName = item.CountryContentName
+				tempDiaginfo.DiagType = "1"
+				tempDiaginfo.MaindiagFlag = "1"
+				tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+			} else {
 
+				var tempDiaginfo service.DiaginfoStructTwo
+				tempDiaginfo.DiagCode = item.CountryCode
+				tempDiaginfo.DiagName = item.CountryContentName
+				tempDiaginfo.DiagType = "2"
+				tempDiaginfo.MaindiagFlag = "0"
+				tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+			}
+		}
 		sickConfigTwo, _ := service.FindSickById(his.SickType)
 		tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
 		tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
-		tempOpspdiseinfo2.MaindiagFlag = "1"
 		tempOpspdiseinfo2.OprnOprtCode = ""
 		tempOpspdiseinfo2.OprnOprtName = ""
 		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)

service/gdyb_service.go

@@ -2774,6 +2774,12 @@ type OpspdiseinfoStruct struct {
 	DiagCode     string
 	OprnOprtName string
 	OprnOprtCode string
+}
+
+type DiaginfoStructTwo struct {
+	DiagType     string
+	DiagCode     string
+	DiagName     string
 	MaindiagFlag string
 }
 
@@ -2826,9 +2832,11 @@ type Struct4101 struct {
 	Age                int64
 	CustomStruct       []CustomStruct
 	OpspdiseinfoStruct []OpspdiseinfoStruct
-	IteminfoStruct     []IteminfoStruct
-	AdmTime            string
-	AdmEndTime         string
+	Diseinfo           []DiaginfoStructTwo
+
+	IteminfoStruct []IteminfoStruct
+	AdmTime        string
+	AdmEndTime     string
 }
 
 //
@@ -2955,19 +2963,17 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	opspdiseinfo = append(opspdiseinfo, opspdiseinfotemp)
 
 	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
-	for index, item := range struct4101.OpspdiseinfoStruct {
-		if index != (len(struct4101.OpspdiseinfoStruct) - 1) {
-			diseinfotemp := make(map[string]interface{})
-			diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
-			diseinfotemp["diag_type"] = item.MaindiagFlag     // 诊断类别  必填
-			diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
-			diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
-			diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
-			diseinfo = append(diseinfo, diseinfotemp)
-		}
+	for _, item := range struct4101.Diseinfo {
+		diseinfotemp := make(map[string]interface{})
+		diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
+		diseinfotemp["diag_type"] = item.DiagType         // 诊断类别  必填
+		diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
+		diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
+		diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
+		diseinfo = append(diseinfo, diseinfotemp)
 	}
 
-	iteminfo := make([]map[string]interface{}, 0) // 住院诊断信息
+	iteminfo := make([]map[string]interface{}, 0)
 	for _, item := range struct4101.IteminfoStruct {
 		iteminfotemp := make(map[string]interface{})
 		iteminfotemp["med_chrgitm"] = item.MedChrgitm            // 医疗收费项目  必填
@@ -3002,11 +3008,9 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
-	//input["opspdiseinfo"] = opspdiseinfo
+	input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
-	//input["oprninfo"] = oprninfo
-	//input["icuinfo"] = icuinfo
 	inputMessage["input"] = input //交易输入
 
 	bytesData, err := json.Marshal(inputMessage)