|
@@ -108,12 +108,12 @@ namespace PTMedicalInsurance
|
|
|
{
|
|
|
if (businessType != "BasicData")//如果是打开数据对照界面不调用初始化
|
|
|
{
|
|
|
- if (!Global.curEvt.needSignIn)
|
|
|
- {
|
|
|
- Global.curEvt.signno = "000000";
|
|
|
- rtnResult = JsonHelper.setIrisReturnValue(0, "签到成功", joRtn).ToString();
|
|
|
- }
|
|
|
- else
|
|
|
+ //if (!Global.curEvt.needSignIn)
|
|
|
+ //{
|
|
|
+ // Global.curEvt.signno = "000000";
|
|
|
+ // rtnResult = JsonHelper.setIrisReturnValue(0, "签到成功", joRtn).ToString();
|
|
|
+ //}
|
|
|
+ //else
|
|
|
{
|
|
|
CallResult callResult = new SignInProcess().Process(joRtn);
|
|
|
rtnResult = callResult.Data;
|
|
@@ -566,6 +566,7 @@ namespace PTMedicalInsurance
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+
|
|
|
//获取pat
|
|
|
hBus.GetAgentFunHisInfo(businessType, joInParam, out Global.pat);
|
|
|
switch (businessType)
|
|
@@ -626,19 +627,30 @@ namespace PTMedicalInsurance
|
|
|
}
|
|
|
case "PreAndInProcessAnalysis"://事前分析 诊间只有住院的事前分析
|
|
|
{
|
|
|
- Global.pat.adm_Dr = int.Parse(JsonHelper.getDestValue(joInParam, "params[0].admID"));
|
|
|
+ //Global.pat.adm_Dr = int.Parse(JsonHelper.getDestValue(joInParam, "params[0].admID"));
|
|
|
JObject joResult = new JObject();
|
|
|
-
|
|
|
joResult.Add("result", JObject.Parse(JsonHelper.getDestValue(joParam, "insuData")));
|
|
|
+ Global.writeLog(joResult.ToString());
|
|
|
//事前分析
|
|
|
if (Global.curEvt.ext.isOpenAnalysis)
|
|
|
{
|
|
|
- if (hBus.PreAnalysis("5", joResult.ToString(), out errMsg) != 0)
|
|
|
+ //1.门诊挂号 2.门诊收费登记 3.住院登记 4.住院收费登记 5.住院执行医嘱 6.门诊结算 7.门诊预结算 8.住院结算 9.住院预结算 10.购药划卡
|
|
|
+ if (hBus.PreAnalysis("2", joResult.ToString(), out errMsg) != 0)
|
|
|
+ {
|
|
|
+ rtnResult = JsonHelper.setExceptionJson(-1, "PreAndInProcessAnalysis 交易", errMsg).ToString();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ else
|
|
|
{
|
|
|
- MessageBox.Show(errMsg);
|
|
|
+ rtnResult = JsonHelper.setExceptionJson(0, "PreAndInProcessAnalysis 交易", "上传成功!").ToString();
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ rtnResult = JsonHelper.setExceptionJson(-1, "PreAndInProcessAnalysis 交易", "本地配置文件isOpenAnalysis设置为不启用!").ToString();
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
break;
|
|
|
}
|