Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/SmjkService.java

@@ -274,19 +274,19 @@ public class SmjkService {
    {
        Map<String,String> params = new HashMap<>();
        String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
                "<root>\n" +
                "<id_card>"+idcard+"</id_card>\n" +
                "<patient_name>"+patientName+"</patient_name>\n" +
                "<ssid>"+ssid+"</ssid>\n" +
                "<section_type>"+sectionType+"</section_type>\n" +
                "<start_time>"+startTime+"</start_time>\n" +
                "<org_code>"+orgCode+"</org_code>\n" +
                "<dept_code>"+deptCode+"</dept_code>\n" +
                "<dept_name>"+deptName+"</dept_name>\n" +
                "<doctor_code>"+doctorCode+"</doctor_code>\n" +
                "<doctor_name>"+doctorName+"</doctor_name>\n";
                "<root>" +
                "<id_card>"+idcard+"</id_card>" +
                "<patient_name>"+patientName+"</patient_name>" +
                "<ssid>"+ssid+"</ssid>" +
                "<section_type>"+sectionType+"</section_type>" +
                "<start_time>"+startTime+"</start_time>" +
                "<org_code>"+orgCode+"</org_code>" +
                "<dept_code>"+deptCode+"</dept_code>" +
                "<dept_name>"+deptName+"</dept_name>" +
                "<doctor_code>"+doctorCode+"</doctor_code>" +
                "<doctor_name>"+doctorName+"</doctor_name>";
        if(!StringUtil.isEmpty(patientPhone)) {
            xml += "<patient_phone>" + patientPhone + "</patient_phone>\n" +
            xml += "<patient_phone>" + patientPhone + "</patient_phone>" +
                   "</root>";
        }
        else{
@@ -300,7 +300,7 @@ public class SmjkService {
        params.put("strCondition",api.encodeParam(key,xml));
        params.put("strCredential",api.encodeParam(key,"<root><org code=\"jtqy\" /><visitor type=\"0\" code=\"jtqy\" key=\"jtqy\" /></root>"));
        params.put("strKey",key.getKey());
        
        String response = postSecondSMJK("urp/WebRegisterByFamily","确认预约接口",params,false);
        return response;

patient-co-service/wlyy_service/src/main/resources/application.yml

@@ -231,6 +231,6 @@ es:
    FollowUpContent: wlyy_followup_content
    QuestionnaireWinning: wlyy_questionnaire_winning
    patientDevice: wlyy_patient_device
  host:  http://59.61.92.90:9065,http://59.61.92.90:9067
  tHost: 59.61.92.90:9066,59.61.92.90:9068
  host:  http://10.95.22.155:9200,http://10.95.22.156:9200
  tHost: 10.95.22.155:9300,10.95.22.156:9300
  clusterName: jkzl

patient-co/patient-co-wlyy/pom.xml

@@ -567,7 +567,7 @@
                    <target>1.8</target>
                    <compilerArguments>
                        <verbose/>
                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
                        <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
                    </compilerArguments>
                </configuration>
                <version>3.1</version>

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/bank/TaskService.java

@@ -84,17 +84,25 @@ public class TaskService {
     */
    public JSONObject selectActivity(JSONObject object,Integer page,Integer size){
        String response = null;
        Patient patient = patientDao.findByCode(object.getString("patientId"));
	    if(object.containsKey("patientid")){
		    Patient patient = patientDao.findByCode(object.getString("patientId"));
		    if (patient != null){
			    object.put("patientIdcard",patient.getIdcard());
			    object.put("unionId",patient.getUnionid());
			    object.remove("patientId");
		    }
	    }
        String url =getBaseUrl() + "findActivity";
        Map<String,String> params = new HashMap<>();
        if (patient != null){
            object.put("patientIdcard",patient.getIdcard());
            object.put("unionId",patient.getUnionid());
        }
        object.remove("patientId");
        params.put("activity",object.toJSONString());
        params.put("page",page.toString());
        params.put("size",size.toString());
        
        params.put("activity",object.toJSONString());
        
        try {
            response = httpClientUtil.httpPost(url,params);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/bank/TaskController.java

@@ -44,7 +44,7 @@ public class TaskController extends BaseController{
                                    @RequestParam(value = "size", required = false)Integer size){
        try {
            JSONObject object = JSONObject.parseObject(task);
            object.put("patientId",getUID());
            object.put("patientId",getRepUID());
            return write(200,"查询成功","data",service.selectActivity(object,page,size));
        }catch (Exception e){
            error(e);

patient-co/patient-co-wlyy/src/main/resources/logback.xml

@@ -23,20 +23,20 @@
        </encoder>
    </appender>
  <!--  <appender name="business_m" class="com.yihu.base.es.ElasticsearchAppender">
        <hosts>http://172.19.103.68:9200</hosts>
        <index>business</index>
        <type>business</type>
        <clusterName>jkzl</clusterName>
        <rolling>year</rolling>
    </appender>
    <appender name="interface_call_m" class="com.yihu.base.es.ElasticsearchAppender">
        <hosts>http://172.19.103.68:9200</hosts>
        <index>interface</index>
        <type>interface</type>
        <clusterName>jkzl</clusterName>
        <rolling>year</rolling>
    </appender>-->
    <!--  <appender name="business_m" class="com.yihu.base.es.ElasticsearchAppender">
          <hosts>http://172.19.103.68:9200</hosts>
          <index>business</index>
          <type>business</type>
          <clusterName>jkzl</clusterName>
          <rolling>year</rolling>
      </appender>
      <appender name="interface_call_m" class="com.yihu.base.es.ElasticsearchAppender">
          <hosts>http://172.19.103.68:9200</hosts>
          <index>interface</index>
          <type>interface</type>
          <clusterName>jkzl</clusterName>
          <rolling>year</rolling>
      </appender>-->
    <!-- project default level -->
    <logger name="com.yihu.wlyy" level="INFO"/>
@@ -44,12 +44,12 @@
    <logger name="jdbc.sqltiming" level="INFO"/>
   <!-- <logger name="com.yihu.wlyy.logs.BusinessLogs" level="INFO" additivity="false">
        <appender-ref ref="business_m"/>
    </logger>
    <logger name="com.yihu.wlyy.logs.InterfaceCallLogs" level="INFO" additivity="false">
        <appender-ref ref="interface_call_m"/>
    </logger>-->
    <!-- <logger name="com.yihu.wlyy.logs.BusinessLogs" level="INFO" additivity="false">
         <appender-ref ref="business_m"/>
     </logger>
     <logger name="com.yihu.wlyy.logs.InterfaceCallLogs" level="INFO" additivity="false">
         <appender-ref ref="interface_call_m"/>
     </logger>-->
    <!--处方支付日志 start-->